Repository: ambari Updated Branches: refs/heads/branch-2.1 3b4835ed5 -> 5b05ece16 refs/heads/trunk cfd548cff -> fd2ac2a7b
AMBARI-13601. Yarn service check and some other fail (unless NN HA is enabled) (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd2ac2a7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd2ac2a7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd2ac2a7 Branch: refs/heads/trunk Commit: fd2ac2a7b8e0d8925109eb4a4c9ae832d6a47937 Parents: cfd548c Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Wed Oct 28 14:52:49 2015 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Wed Oct 28 14:52:49 2015 +0200 ---------------------------------------------------------------------- .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 2 +- .../python/stacks/2.0.6/HDFS/test_namenode.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fd2ac2a7/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py index 57f5e54..72bf2c4 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py @@ -123,7 +123,7 @@ def namenode(action=None, hdfs_binary=None, do_format=True, upgrade_type=None, e if params.dfs_ha_enabled: is_active_namenode_cmd = as_user(format("{hdfs_binary} --config {hadoop_conf_dir} haadmin -getServiceState {namenode_id} | grep active"), params.hdfs_user, env={'PATH':params.hadoop_bin_dir}) else: - is_active_namenode_cmd = False + is_active_namenode_cmd = True # During NonRolling Upgrade, both NameNodes are initially down, # so no point in checking if this is the active or standby. http://git-wip-us.apache.org/repos/asf/ambari/blob/fd2ac2a7/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 857cea6..21b71f9 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 @@ -95,7 +95,7 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('HdfsResource', '/tmp', security_enabled = False, - only_if=False, + only_if=True, keytab = UnknownConfigurationMock(), hadoop_bin_dir = '/usr/bin', default_fs = 'wasb://a...@c6401.ambari.apache.org', @@ -112,7 +112,7 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa', security_enabled = False, - only_if=False, + only_if=True, keytab = UnknownConfigurationMock(), hadoop_bin_dir = '/usr/bin', default_fs = 'wasb://a...@c6401.ambari.apache.org', @@ -129,7 +129,7 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('HdfsResource', None, security_enabled = False, - only_if=False, + only_if=True, keytab = UnknownConfigurationMock(), hadoop_bin_dir = '/usr/bin', default_fs = 'wasb://a...@c6401.ambari.apache.org', @@ -208,7 +208,7 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('HdfsResource', '/tmp', security_enabled = False, - only_if = False, + only_if = True, keytab = UnknownConfigurationMock(), hadoop_bin_dir = '/usr/bin', default_fs = 'hdfs://c6401.ambari.apache.org:8020', @@ -225,7 +225,7 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa', security_enabled = False, - only_if = False, + only_if = True, keytab = UnknownConfigurationMock(), hadoop_bin_dir = '/usr/bin', default_fs = 'hdfs://c6401.ambari.apache.org:8020', @@ -242,7 +242,7 @@ class TestNamenode(RMFTestCase): ) self.assertResourceCalled('HdfsResource', None, security_enabled = False, - only_if = False, + only_if = True, keytab = UnknownConfigurationMock(), hadoop_bin_dir = '/usr/bin', default_fs = 'hdfs://c6401.ambari.apache.org:8020', @@ -354,7 +354,7 @@ class TestNamenode(RMFTestCase): type = 'directory', action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', mode = 0777, - only_if = False + only_if = True ) self.assertResourceCalled('HdfsResource', '/user/ambari-qa', security_enabled = True, @@ -368,11 +368,11 @@ class TestNamenode(RMFTestCase): type = 'directory', action = ['create_on_execute'], hdfs_site=self.getConfig()['configurations']['hdfs-site'], principal_name='hdfs', default_fs='hdfs://c6401.ambari.apache.org:8020', mode = 0770, - only_if = False + only_if = True ) self.assertResourceCalled('HdfsResource', None, security_enabled = True, - only_if = False, + only_if = True, keytab = '/etc/security/keytabs/hdfs.headless.keytab', hadoop_bin_dir = '/usr/bin', kinit_path_local = '/usr/bin/kinit',
