Repository: ambari Updated Branches: refs/heads/trunk 71cfa6124 -> 5772ceb05
AMBARI-15776. Not all log and PID dirs have "hadoop" group (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5772ceb0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5772ceb0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5772ceb0 Branch: refs/heads/trunk Commit: 5772ceb05a1804b1c16cccc7968cd17a25de8ccd Parents: 71cfa61 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Fri Apr 8 11:50:26 2016 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Fri Apr 8 11:50:26 2016 +0300 ---------------------------------------------------------------------- .../FLUME/1.4.0.2.0/package/scripts/flume.py | 5 +++- .../HDFS/2.1.0.2.0/package/scripts/utils.py | 2 ++ .../YARN/2.1.0.2.0/package/scripts/yarn.py | 1 + .../python/stacks/2.0.6/FLUME/test_flume.py | 30 ++++++++++++++++---- .../python/stacks/2.0.6/HDFS/test_datanode.py | 8 ++++++ .../stacks/2.0.6/HDFS/test_journalnode.py | 4 +++ .../python/stacks/2.0.6/HDFS/test_namenode.py | 18 ++++++++++++ .../python/stacks/2.0.6/HDFS/test_nfsgateway.py | 2 ++ .../python/stacks/2.0.6/HDFS/test_snamenode.py | 4 +++ .../test/python/stacks/2.0.6/HDFS/test_zkfc.py | 8 ++++++ .../stacks/2.0.6/YARN/test_historyserver.py | 2 ++ .../stacks/2.0.6/YARN/test_mapreduce2_client.py | 2 ++ .../stacks/2.0.6/YARN/test_nodemanager.py | 2 ++ .../stacks/2.0.6/YARN/test_resourcemanager.py | 2 ++ .../stacks/2.0.6/YARN/test_yarn_client.py | 3 ++ .../python/stacks/2.0.6/configs/flume_only.json | 8 ++++++ .../stacks/2.0.6/configs/flume_target.json | 10 ++++++- .../stacks/2.1/YARN/test_apptimelineserver.py | 1 + .../test/python/stacks/2.3/YARN/test_ats_1_5.py | 1 + 19 files changed, 105 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py index db52431..9df2ba6 100644 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py +++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume.py @@ -94,13 +94,16 @@ def flume(action = None): ) Directory(params.flume_run_dir, + group=params.user_group, + owner=params.flume_user, ) Directory(params.flume_conf_dir, create_parents = True, owner=params.flume_user, ) - Directory(params.flume_log_dir, + Directory(params.flume_log_dir, + group=params.user_group, owner=params.flume_user, cd_access="a", mode=0755, http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py index f9ee40d..8501a8e 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py @@ -208,6 +208,7 @@ def service(action=None, name=None, user=None, options="", create_pid_dir=False, if create_pid_dir: Directory(pid_dir, owner=user, + group=params.user_group, create_parents = True) if create_log_dir: if name == "nfs3": @@ -218,6 +219,7 @@ def service(action=None, name=None, user=None, options="", create_pid_dir=False, else: Directory(log_dir, owner=user, + group=params.user_group, create_parents = True) if params.security_enabled and name == "datanode": http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py index 82f8de4..f43292a 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py @@ -181,6 +181,7 @@ def yarn(name = None): ) Directory([params.yarn_log_dir_prefix], owner=params.yarn_user, + group=params.user_group, create_parents = True, ignore_failures=True, cd_access = 'a', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py index 5ee1fd9..964280d 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py +++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py @@ -227,7 +227,9 @@ class TestFlumeHandler(RMFTestCase): self.assertNoMoreResources() def assert_configure_default(self, check_mc=True): - self.assertResourceCalled('Directory', '/var/run/flume',) + self.assertResourceCalled('Directory', '/var/run/flume', + owner = 'flume', + group = 'hadoop') self.assertResourceCalled('Directory', '/etc/flume/conf', owner='flume', @@ -236,6 +238,7 @@ class TestFlumeHandler(RMFTestCase): self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume', + group = 'hadoop', cd_access = 'a', mode=0755 ) @@ -275,13 +278,22 @@ class TestFlumeHandler(RMFTestCase): ) def assert_configure_many(self): - self.assertResourceCalled('Directory', '/var/run/flume') + self.assertResourceCalled('Directory', + '/var/run/flume', + owner='flume', + group = 'hadoop' + ) self.assertResourceCalled('Directory', '/etc/flume/conf', owner='flume', create_parents = True) - self.assertResourceCalled('Directory', '/var/log/flume', owner = 'flume', cd_access = 'a', mode=0755) + self.assertResourceCalled('Directory', + '/var/log/flume', + owner = 'flume', + group = 'hadoop', + cd_access = 'a', + mode=0755) top = build_flume(self.getConfig()['configurations']['flume-conf']['content']) @@ -438,7 +450,9 @@ class TestFlumeHandler(RMFTestCase): stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Directory', '/var/run/flume',) + self.assertResourceCalled('Directory', '/var/run/flume', + group = 'hadoop', + owner='flume',) self.assertResourceCalled('Directory', '/etc/flume/conf', owner='flume', @@ -448,6 +462,7 @@ class TestFlumeHandler(RMFTestCase): '/var/log/flume', owner = 'flume', cd_access = 'a', + group = 'hadoop', mode=0755) self.assertResourceCalled('Directory', @@ -489,7 +504,9 @@ class TestFlumeHandler(RMFTestCase): stack_version = self.STACK_VERSION, target = RMFTestCase.TARGET_COMMON_SERVICES) - self.assertResourceCalled('Directory', '/var/run/flume',) + self.assertResourceCalled('Directory', '/var/run/flume', + group = 'hadoop', + owner='flume') self.assertResourceCalled('Directory', '/usr/hdp/current/flume-server/conf', owner='flume', @@ -497,7 +514,8 @@ class TestFlumeHandler(RMFTestCase): self.assertResourceCalled('Directory', '/var/log/flume', - owner = 'flume', + owner = 'flume', + group = 'hadoop', cd_access = 'a', mode=0755) http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py index f939eed..78b8171 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py @@ -57,10 +57,12 @@ class TestDatanode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid', @@ -117,10 +119,12 @@ class TestDatanode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid', @@ -155,10 +159,12 @@ class TestDatanode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid', @@ -196,10 +202,12 @@ class TestDatanode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py index 4d91897..08eab25 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py @@ -55,10 +55,12 @@ class TestJournalnode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-journalnode.pid', @@ -113,10 +115,12 @@ class TestJournalnode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-journalnode.pid', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py index 9ece2a3..fd4d0f7 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py @@ -75,10 +75,12 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid', @@ -192,10 +194,12 @@ class TestNamenode(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', create_parents = True, + group = 'hadoop' ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', create_parents = True, + group = 'hadoop' ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid', action = ['delete'], @@ -320,10 +324,12 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid', @@ -422,10 +428,12 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid', @@ -522,10 +530,12 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid', @@ -625,10 +635,12 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid', @@ -734,10 +746,12 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid', @@ -839,10 +853,12 @@ class TestNamenode(RMFTestCase): # command is run before the namenode launches self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid', @@ -952,10 +968,12 @@ class TestNamenode(RMFTestCase): # command is run before the namenode launches self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py index ed03ae1..c8e7d27 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py @@ -61,6 +61,7 @@ class TestNFSGateway(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/root', owner = 'root', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/root', @@ -128,6 +129,7 @@ class TestNFSGateway(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/root', owner = 'root', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/root', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py index 9e66e51..7b9dcb4 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py @@ -62,10 +62,12 @@ class TestSNamenode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid', @@ -130,10 +132,12 @@ class TestSNamenode(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py index 72728a3..e952108 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py @@ -90,10 +90,12 @@ class TestZkfc(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', create_parents = True, + group = 'hadoop' ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', create_parents = True, + group = 'hadoop' ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid', action = ['delete'], @@ -185,10 +187,12 @@ class TestZkfc(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', create_parents = True, + group = 'hadoop' ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', create_parents = True, + group = 'hadoop' ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid', action = ['delete'], @@ -280,10 +284,12 @@ class TestZkfc(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', create_parents = True, + group = 'hadoop' ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', create_parents = True, + group = 'hadoop' ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid', action = ['delete'], @@ -360,9 +366,11 @@ class TestZkfc(RMFTestCase): self.assertResourceCalled('Directory', '/var/run/hadoop/hdfs', owner = 'hdfs', create_parents = True, + group = 'hadoop' ) self.assertResourceCalled('Directory', '/var/log/hadoop/hdfs', owner = 'hdfs', + group = 'hadoop', create_parents = True, ) self.assertResourceCalled('File', '/var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py index 19253b2..caf1430 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py @@ -356,6 +356,7 @@ class TestHistoryServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', @@ -627,6 +628,7 @@ class TestHistoryServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py index de7d641..0083d75 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py @@ -87,6 +87,7 @@ class TestMapReduce2Client(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', @@ -254,6 +255,7 @@ class TestMapReduce2Client(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py index e1036c5..665ebfb 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py @@ -215,6 +215,7 @@ class TestNodeManager(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', @@ -401,6 +402,7 @@ class TestNodeManager(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py index e372667..aacf7e0 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py @@ -224,6 +224,7 @@ class TestResourceManager(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', @@ -387,6 +388,7 @@ class TestResourceManager(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py index 9f7770c..fe033c6 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py @@ -87,6 +87,7 @@ class TestYarnClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', @@ -254,6 +255,7 @@ class TestYarnClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', @@ -429,6 +431,7 @@ class TestYarnClient(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/configs/flume_only.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_only.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_only.json index 1e39008..1550715 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_only.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_only.json @@ -52,6 +52,14 @@ }, "flume-log4j": { "content": "log4jproperties\nline2" + }, + "cluster-env": { + "managed_hdfs_resource_property_names": "", + "security_enabled": "false", + "ignore_groupsusers_create": "false", + "smokeuser": "ambari-qa", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop" } }, "configuration_attributes": { http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json index 8648395..a23b313 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json +++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json @@ -104,7 +104,15 @@ "oozie.authentication.type": "simple", "oozie.service.JPAService.jdbc.driver": "org.apache.derby.jdbc.EmbeddedDriver", "oozie.system.id": "oozie-${user.name}" - }, + }, + "cluster-env": { + "managed_hdfs_resource_property_names": "", + "security_enabled": "false", + "ignore_groupsusers_create": "false", + "smokeuser": "ambari-qa", + "kerberos_domain": "EXAMPLE.COM", + "user_group": "hadoop" + }, "storm-site": { "topology.tuple.serializer": "backtype.storm.serialization.types.ListDelegateSerializer", "topology.workers": "1", http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py index d05c9fc..9674960 100644 --- a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py +++ b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py @@ -138,6 +138,7 @@ class TestAppTimelineServer(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', create_parents = True, ignore_failures = True, cd_access = 'a', http://git-wip-us.apache.org/repos/asf/ambari/blob/5772ceb0/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py b/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py index a274d45..c382b20 100644 --- a/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py +++ b/ambari-server/src/test/python/stacks/2.3/YARN/test_ats_1_5.py @@ -94,6 +94,7 @@ class TestAts(RMFTestCase): ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', + group = 'hadoop', ignore_failures = True, create_parents = True, cd_access = 'a',
