Repository: ambari Updated Branches: refs/heads/trunk 8e7220315 -> 0fc5b8fd3
AMBARI-17391: Spark thriftserver fails to start when umask = 027 due to permission issues on java-opts (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0fc5b8fd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0fc5b8fd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0fc5b8fd Branch: refs/heads/trunk Commit: 0fc5b8fd3c474881cff2eaf2ebdafa91068336ae Parents: 8e72203 Author: Jayush Luniya <[email protected]> Authored: Fri Jun 24 10:38:58 2016 -0700 Committer: Jayush Luniya <[email protected]> Committed: Fri Jun 24 10:38:58 2016 -0700 ---------------------------------------------------------------------- .../SPARK/1.2.1/package/scripts/setup_spark.py | 8 ++++++-- .../SPARK2/2.0.0/package/scripts/setup_spark.py | 5 ++++- .../test/python/stacks/2.2/SPARK/test_job_history_server.py | 6 ++++++ .../src/test/python/stacks/2.2/SPARK/test_spark_client.py | 6 ++++++ .../test/python/stacks/2.3/SPARK/test_spark_thrift_server.py | 6 +++++- 5 files changed, 27 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc5b8fd/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py index 275ab23..2b5d36b 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/setup_spark.py @@ -68,6 +68,7 @@ def setup_spark(env, type, upgrade_type=None, action=None, config_dir=None): key_value_delimiter = " ", owner=params.spark_user, group=params.spark_group, + mode=0644 ) # create spark-env.sh in etc/conf dir @@ -90,13 +91,15 @@ def setup_spark(env, type, upgrade_type=None, action=None, config_dir=None): File(os.path.join(config_dir, 'metrics.properties'), owner=params.spark_user, group=params.spark_group, - content=InlineTemplate(params.spark_metrics_properties) + content=InlineTemplate(params.spark_metrics_properties), + mode=0644 ) File(os.path.join(params.spark_conf, 'java-opts'), owner=params.spark_user, group=params.spark_group, - content=InlineTemplate(params.spark_javaopts_properties) + content=InlineTemplate(params.spark_javaopts_properties), + mode=0644 ) Directory(params.spark_logs_dir, @@ -119,6 +122,7 @@ def setup_spark(env, type, upgrade_type=None, action=None, config_dir=None): owner = params.hive_user, group = params.user_group, key_value_delimiter = " ", + mode=0644 ) effective_version = params.version if upgrade_type is not None else params.stack_version_formatted http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc5b8fd/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py index 6b2c915..a7b8459 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/setup_spark.py @@ -58,6 +58,7 @@ def setup_spark(env, type, upgrade_type = None, action = None): key_value_delimiter = " ", owner=params.spark_user, group=params.spark_group, + mode=0644 ) # create spark-env.sh in etc/conf dir @@ -80,7 +81,8 @@ def setup_spark(env, type, upgrade_type = None, action = None): File(os.path.join(params.spark_conf, 'metrics.properties'), owner=params.spark_user, group=params.spark_group, - content=InlineTemplate(params.spark_metrics_properties) + content=InlineTemplate(params.spark_metrics_properties), + mode=0644 ) if params.is_hive_installed: @@ -97,6 +99,7 @@ def setup_spark(env, type, upgrade_type = None, action = None): owner = params.hive_user, group = params.user_group, key_value_delimiter = " ", + mode=0644 ) effective_version = params.version if upgrade_type is not None else params.stack_version_formatted http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc5b8fd/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py index 8c02ac4..b2ed5df 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_job_history_server.py @@ -207,6 +207,7 @@ class TestJobHistoryServer(RMFTestCase): key_value_delimiter = ' ', group = 'spark', properties = self.getConfig()['configurations']['spark-defaults'], + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/spark-env.sh', content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']), @@ -224,11 +225,13 @@ class TestJobHistoryServer(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/java-opts', content = InlineTemplate(' '), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs', owner = 'spark', @@ -285,6 +288,7 @@ class TestJobHistoryServer(RMFTestCase): key_value_delimiter = ' ', group = 'spark', properties = self.getConfig()['configurations']['spark-defaults'], + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/spark-env.sh', content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']), @@ -302,11 +306,13 @@ class TestJobHistoryServer(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/java-opts', content = InlineTemplate(' '), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs', owner = 'spark', http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc5b8fd/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py index c2c5d56..a8e580a 100644 --- a/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py +++ b/ambari-server/src/test/python/stacks/2.2/SPARK/test_spark_client.py @@ -69,6 +69,7 @@ class TestSparkClient(RMFTestCase): key_value_delimiter = ' ', group = 'spark', properties = self.getConfig()['configurations']['spark-defaults'], + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/spark-env.sh', content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']), @@ -86,11 +87,13 @@ class TestSparkClient(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/java-opts', content = InlineTemplate(' '), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs', owner = 'spark', @@ -117,6 +120,7 @@ class TestSparkClient(RMFTestCase): key_value_delimiter = ' ', group = 'spark', properties = self.getConfig()['configurations']['spark-defaults'], + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/spark-env.sh', content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']), @@ -134,11 +138,13 @@ class TestSparkClient(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/java-opts', content = InlineTemplate(' '), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs', owner = 'spark', http://git-wip-us.apache.org/repos/asf/ambari/blob/0fc5b8fd/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 aa57455..a1abdfa 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 @@ -127,6 +127,7 @@ class TestSparkThriftServer(RMFTestCase): key_value_delimiter = ' ', group = 'spark', properties = self.getConfig()['configurations']['spark-defaults'], + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/spark-env.sh', content = InlineTemplate(self.getConfig()['configurations']['spark-env']['content']), @@ -144,11 +145,13 @@ class TestSparkThriftServer(RMFTestCase): content = InlineTemplate(self.getConfig()['configurations']['spark-metrics-properties']['content']), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('File', '/usr/hdp/current/spark-client/conf/java-opts', content = InlineTemplate(' '), owner = 'spark', group = 'spark', + mode = 0644 ) self.assertResourceCalled('Directory', '/usr/hdp/current/spark-client/logs', owner = 'spark', @@ -159,7 +162,8 @@ class TestSparkThriftServer(RMFTestCase): key_value_delimiter = ' ', owner = 'hive', group = 'hadoop', - properties = self.getConfig()['configurations']['spark-thrift-sparkconf'] + properties = self.getConfig()['configurations']['spark-thrift-sparkconf'], + mode = 0644 ) @patch("resource_management.libraries.functions.copy_tarball.copy_to_hdfs")
