You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/10/28 13:52:58 UTC
[2/2] ambari git commit: AMBARI-13601. Yarn service check and some
other fail (unless NN HA is enabled) (aonishuk)
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/5b05ece1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5b05ece1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5b05ece1
Branch: refs/heads/branch-2.1
Commit: 5b05ece16b7dc93062b8a591a9a216065f065492
Parents: 3b4835e
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Oct 28 14:52:52 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Oct 28 14:52:52 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/5b05ece1/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/5b05ece1/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 6a47f6f..d013785 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://abc@c6401.ambari.apache.org',
@@ -111,7 +111,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://abc@c6401.ambari.apache.org',
@@ -127,7 +127,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://abc@c6401.ambari.apache.org',
@@ -205,7 +205,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',
@@ -221,7 +221,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',
@@ -237,7 +237,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',
@@ -347,7 +347,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,
@@ -360,11 +360,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',