AMBARI-22303. Spark history server is stopped (with umask 027 and custom spark log/pid dir) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/46ad6c68 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/46ad6c68 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/46ad6c68 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 46ad6c6878b00f7791845ecf7c2b3fef7244faad Parents: feccebc Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Fri Nov 10 12:53:06 2017 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Fri Nov 10 12:53:06 2017 +0200 ---------------------------------------------------------------------- .../SPARK/1.2.1/package/scripts/setup_spark.py | 3 ++- .../SPARK2/2.0.0/package/scripts/setup_spark.py | 3 ++- .../python/stacks/2.2/SPARK/test_job_history_server.py | 12 ++++++++---- .../test/python/stacks/2.2/SPARK/test_spark_client.py | 12 ++++++++---- .../python/stacks/2.3/SPARK/test_spark_thrift_server.py | 6 ++++-- 5 files changed, 24 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/46ad6c68/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 53c8f9e..6a29efb 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 @@ -52,7 +52,8 @@ def setup_spark(env, type, upgrade_type=None, action=None, config_dir=None): owner=params.spark_user, group=params.user_group, mode=0775, - create_parents = True + create_parents = True, + cd_access = 'a', ) if type == 'server' and action == 'config': params.HdfsResource(params.spark_hdfs_user_dir, http://git-wip-us.apache.org/repos/asf/ambari/blob/46ad6c68/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 a7b8459..792b2a1 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 @@ -42,7 +42,8 @@ def setup_spark(env, type, upgrade_type = None, action = None): owner=params.spark_user, group=params.user_group, mode=0775, - create_parents = True + create_parents = True, + cd_access = 'a', ) if type == 'server' and action == 'config': params.HdfsResource(params.spark_hdfs_user_dir, http://git-wip-us.apache.org/repos/asf/ambari/blob/46ad6c68/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 922ace2..8801746 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 @@ -165,13 +165,15 @@ class TestJobHistoryServer(RMFTestCase): owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('HdfsResource', '/user/spark', immutable_paths = self.DEFAULT_IMMUTABLE_PATHS, @@ -246,13 +248,15 @@ class TestJobHistoryServer(RMFTestCase): owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('HdfsResource', '/user/spark', immutable_paths = self.DEFAULT_IMMUTABLE_PATHS, http://git-wip-us.apache.org/repos/asf/ambari/blob/46ad6c68/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 b4535cd..e15d5a4 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 @@ -58,13 +58,15 @@ class TestSparkClient(RMFTestCase): owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf', owner = 'spark', @@ -108,13 +110,15 @@ class TestSparkClient(RMFTestCase): owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('PropertiesFile', '/usr/hdp/current/spark-client/conf/spark-defaults.conf', owner = 'spark', http://git-wip-us.apache.org/repos/asf/ambari/blob/46ad6c68/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 fbe5403..78d45cf 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 @@ -85,13 +85,15 @@ class TestSparkThriftServer(RMFTestCase): owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('Directory', '/var/log/spark', owner = 'spark', group = 'hadoop', create_parents = True, - mode = 0775 + mode = 0775, + cd_access = 'a', ) self.assertResourceCalled('HdfsResource', '/user/spark', immutable_paths = self.DEFAULT_IMMUTABLE_PATHS,
