Repository: ambari Updated Branches: refs/heads/branch-2.2 fe999d740 -> 33fdfc658
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/33fdfc65 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33fdfc65 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33fdfc65 Branch: refs/heads/branch-2.2 Commit: 33fdfc6586eaf25e9e2cd563c28fce70d7ccf6c0 Parents: fe999d7 Author: Andrew Onishuk <[email protected]> Authored: Thu Dec 17 20:34:49 2015 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Thu Dec 17 20:34:49 2015 +0200 ---------------------------------------------------------------------- .../common-services/SPARK/1.2.0.2.2/package/scripts/params.py | 3 +-- .../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, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/33fdfc65/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 82ea855..f0d587d 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 @@ -157,8 +157,7 @@ if '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'] + 'hive.metastore.connect.retries' : config['configurations']['hive-site']['hive.metastore.connect.retries'] }) spark_hive_properties.update(config['configurations']['spark-hive-site-override']) http://git-wip-us.apache.org/repos/asf/ambari/blob/33fdfc65/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 b0ca499..eaa17a3 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/33fdfc65/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/33fdfc65/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 c21ce2f..c738245 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 @@ -141,6 +141,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'] )
