Ver Fonte

AMBARI-11548. DN Decommission does not work when default file system is not hdfs (smohanty)

Sumit Mohanty há 10 anos atrás
pai
commit
79437ef2b9

+ 1 - 1
ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py

@@ -335,7 +335,7 @@ def decommission():
       # need to execute each command scoped to a particular namenode
       # need to execute each command scoped to a particular namenode
       nn_refresh_cmd = format('dfsadmin -fs hdfs://{namenode_rpc} -refreshNodes')
       nn_refresh_cmd = format('dfsadmin -fs hdfs://{namenode_rpc} -refreshNodes')
     else:
     else:
-      nn_refresh_cmd = format('dfsadmin -refreshNodes')
+      nn_refresh_cmd = format('dfsadmin -fs {namenode_address} -refreshNodes')
     ExecuteHadoop(nn_refresh_cmd,
     ExecuteHadoop(nn_refresh_cmd,
                   user=hdfs_user,
                   user=hdfs_user,
                   conf_dir=conf_dir,
                   conf_dir=conf_dir,

+ 2 - 2
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py

@@ -780,7 +780,7 @@ class TestNamenode(RMFTestCase):
                               group = 'hadoop',
                               group = 'hadoop',
                               )
                               )
     self.assertResourceCalled('Execute', '', user = 'hdfs')
     self.assertResourceCalled('Execute', '', user = 'hdfs')
-    self.assertResourceCalled('ExecuteHadoop', 'dfsadmin -refreshNodes',
+    self.assertResourceCalled('ExecuteHadoop', 'dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -refreshNodes',
                               user = 'hdfs',
                               user = 'hdfs',
                               conf_dir = '/etc/hadoop/conf',
                               conf_dir = '/etc/hadoop/conf',
                               bin_dir = '/usr/bin',
                               bin_dir = '/usr/bin',
@@ -841,7 +841,7 @@ class TestNamenode(RMFTestCase):
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/nn.service.keytab nn/c6401.ambari.apache.org@EXAMPLE.COM;',
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/nn.service.keytab nn/c6401.ambari.apache.org@EXAMPLE.COM;',
         user = 'hdfs',
         user = 'hdfs',
     )
     )
-    self.assertResourceCalled('ExecuteHadoop', 'dfsadmin -refreshNodes',
+    self.assertResourceCalled('ExecuteHadoop', 'dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -refreshNodes',
         bin_dir = '/usr/bin',
         bin_dir = '/usr/bin',
         conf_dir = '/etc/hadoop/conf',
         conf_dir = '/etc/hadoop/conf',
         kinit_override = True,
         kinit_override = True,