ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: AMBARI-14421. Spark thrift cannot start with umask 027 (aonishuk)
Date Thu, 17 Dec 2015 18:39:15 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 66e1595c3 -> d86dbf35c


AMBARI-14421. Spark thrift cannot start with umask 027 (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d86dbf35
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d86dbf35
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d86dbf35

Branch: refs/heads/trunk
Commit: d86dbf35cf3f28972db79eb322c5b6994a25db26
Parents: 66e1595
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Thu Dec 17 20:38:13 2015 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Thu Dec 17 20:38:13 2015 +0200

----------------------------------------------------------------------
 .../common-services/SPARK/1.2.0.2.2/package/scripts/params.py   | 1 -
 .../SPARK/1.2.0.2.2/package/scripts/setup_spark.py              | 1 +
 .../services/SPARK/configuration/spark-hive-site-override.xml   | 5 +++++
 .../test/python/stacks/2.3/SPARK/test_spark_thrift_server.py    | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d86dbf35/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index 59aeb19..68240bd 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -160,7 +160,6 @@ if has_spark_thriftserver and 'spark-thrift-sparkconf' in config['configurations
     # update default metastore client properties (async wait for metastore component) it
is useful in case of
     # blueprint provisioning when hive-metastore and spark-thriftserver is not on the same
host.
     spark_hive_properties.update({
-      'hive.metastore.connect.retries' : config['configurations']['hive-site']['hive.metastore.connect.retries'],
       'hive.metastore.client.socket.timeout' : config['configurations']['hive-site']['hive.metastore.client.socket.timeout']
     })
     spark_hive_properties.update(config['configurations']['spark-hive-site-override'])

http://git-wip-us.apache.org/repos/asf/ambari/blob/d86dbf35/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py
index 0a32055..4b38572 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/setup_spark.py
@@ -86,5 +86,6 @@ def setup_spark(env, type, action = None):
     PropertiesFile(params.spark_thrift_server_conf_file,
       properties = params.config['configurations']['spark-thrift-sparkconf'],
       owner = params.hive_user,
+      group = params.user_group,
       key_value_delimiter = " ",
     )

http://git-wip-us.apache.org/repos/asf/ambari/blob/d86dbf35/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml
index d65c8b1..8f0bc62 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/configuration/spark-hive-site-override.xml
@@ -19,6 +19,11 @@ limitations under the License.
 
 <configuration supports_final="true">
   <property>
+    <name>hive.metastore.client.socket.timeout</name>
+    <value>1800</value>
+    <description>MetaStore Client socket timeout in seconds</description>
+  </property>
+  <property>
   	<name>hive.metastore.client.connect.retry.delay</name>
   	<value>5</value>
     <description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/d86dbf35/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
index 0a5ab6b..ebdf3fe 100644
--- a/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/SPARK/test_spark_thrift_server.py
@@ -143,6 +143,7 @@ class TestSparkThriftServer(RMFTestCase):
     self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-thrift-sparkconf.conf',
         key_value_delimiter = ' ',
         owner = 'hive',
+        group = 'hadoop',
         properties = self.getConfig()['configurations']['spark-thrift-sparkconf']
     )
 


Mime
View raw message