|
@@ -425,7 +425,7 @@ class TestNamenode(RMFTestCase):
|
|
|
environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
|
|
|
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
|
|
|
)
|
|
|
- self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
|
|
|
+ self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://ns1 -safemode get | grep 'Safe mode is OFF'",
|
|
|
tries=180,
|
|
|
try_sleep=10,
|
|
|
user="hdfs",
|
|
@@ -519,7 +519,7 @@ class TestNamenode(RMFTestCase):
|
|
|
self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs',
|
|
|
user = 'hdfs',
|
|
|
)
|
|
|
- self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
|
|
|
+ self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://ns1 -safemode get | grep 'Safe mode is OFF'",
|
|
|
tries=180,
|
|
|
try_sleep=10,
|
|
|
user="hdfs",
|
|
@@ -622,7 +622,7 @@ class TestNamenode(RMFTestCase):
|
|
|
environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
|
|
|
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
|
|
|
)
|
|
|
- self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
|
|
|
+ self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://ns1 -safemode get | grep 'Safe mode is OFF'",
|
|
|
tries=180,
|
|
|
try_sleep=10,
|
|
|
user="hdfs",
|
|
@@ -724,7 +724,7 @@ class TestNamenode(RMFTestCase):
|
|
|
environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
|
|
|
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
|
|
|
)
|
|
|
- self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6402.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
|
|
|
+ self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://ns1 -safemode get | grep 'Safe mode is OFF'",
|
|
|
tries=180,
|
|
|
try_sleep=10,
|
|
|
user="hdfs",
|
|
@@ -780,10 +780,10 @@ class TestNamenode(RMFTestCase):
|
|
|
)
|
|
|
self.assertNoMoreResources()
|
|
|
self.assertTrue(call_mocks.called)
|
|
|
- self.assertEqual(1, call_mocks.call_count)
|
|
|
+ self.assertEqual(2, call_mocks.call_count)
|
|
|
calls = [
|
|
|
call('hdfs namenode -bootstrapStandby -nonInteractive', logoutput=False, user=u'hdfs'),
|
|
|
- ]
|
|
|
+ call("ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn2 | grep active'", logoutput=True)]
|
|
|
call_mocks.assert_has_calls(calls, any_order=False)
|
|
|
|
|
|
# tests namenode start command when NameNode HA is enabled, and
|
|
@@ -834,7 +834,7 @@ class TestNamenode(RMFTestCase):
|
|
|
environment = {'HADOOP_LIBEXEC_DIR': '/usr/lib/hadoop/libexec'},
|
|
|
not_if = "ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E test -f /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid && ambari-sudo.sh [RMF_ENV_PLACEHOLDER] -H -E pgrep -F /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid",
|
|
|
)
|
|
|
- self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://c6402.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
|
|
|
+ self.assertResourceCalled('Execute', "hdfs dfsadmin -fs hdfs://ns1 -safemode get | grep 'Safe mode is OFF'",
|
|
|
tries=180,
|
|
|
try_sleep=10,
|
|
|
user="hdfs",
|
|
@@ -890,8 +890,9 @@ class TestNamenode(RMFTestCase):
|
|
|
)
|
|
|
self.assertNoMoreResources()
|
|
|
self.assertTrue(call_mocks.called)
|
|
|
- self.assertEqual(2, call_mocks.call_count)
|
|
|
+ self.assertEqual(3, call_mocks.call_count)
|
|
|
calls = [
|
|
|
+ call("ambari-sudo.sh su hdfs -l -s /bin/bash -c 'export PATH=/bin:/usr/bin ; hdfs --config /etc/hadoop/conf haadmin -getServiceState nn2 | grep active'", logoutput=True),
|
|
|
call('hdfs namenode -bootstrapStandby -nonInteractive -force', logoutput=False, user=u'hdfs'),
|
|
|
call('hdfs namenode -bootstrapStandby -nonInteractive -force', logoutput=False, user=u'hdfs')]
|
|
|
call_mocks.assert_has_calls(calls, any_order=True)
|