浏览代码

AMBARI-8501. Datanode fails to start during Install Wizard because Namenode is not up (alejandro)

Alejandro Fernandez 10 年之前
父节点
当前提交
6967f5b023

+ 3 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py

@@ -100,10 +100,13 @@ def service(action=None, name=None, user=None, create_pid_dir=False,
   )
 
   #After performing the desired action, perform additional tasks.
+  # Only needed during Rolling Upgrade
+  '''
   if action == "start":
     Execute("hdfs dfsadmin -report -live",
             user=params.hdfs_principal_name if params.security_enabled else params.hdfs_user
     )
+  '''
 
   if action == "stop":
     File(pid_file,

+ 0 - 16
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py

@@ -61,10 +61,6 @@ class TestDatanode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute',
-                              'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertNoMoreResources()
 
   @patch("os.path.exists", new = MagicMock(return_value=False))
@@ -137,10 +133,6 @@ class TestDatanode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 2>&1',
         user = 'root',
     )
-    self.assertResourceCalled('Execute',
-                              'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertNoMoreResources()
 
   def test_start_secured_HDP22_root(self):
@@ -177,10 +169,6 @@ class TestDatanode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 2>&1',
         user = 'root',
     )
-    self.assertResourceCalled('Execute',
-                              'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertNoMoreResources()
 
   def test_start_secured_HDP22_non_root_https_only(self):
@@ -220,10 +208,6 @@ class TestDatanode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-datanode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute',
-                              'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertNoMoreResources()
 
   @patch("os.path.exists", new = MagicMock(return_value=False))

+ 0 - 6
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py

@@ -60,9 +60,6 @@ class TestJournalnode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-journalnode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-journalnode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', 'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertNoMoreResources()
 
   def test_stop_default(self):
@@ -129,9 +126,6 @@ class TestJournalnode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-journalnode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-journalnode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', 'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertNoMoreResources()
 
   def test_stop_secured(self):

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

@@ -82,9 +82,6 @@ class TestNamenode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', 'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertResourceCalled('Execute', 'hdfs --config /etc/hadoop/conf dfsadmin -safemode leave',
         path = ['/usr/bin'],
         user = 'hdfs',
@@ -202,9 +199,6 @@ class TestNamenode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', 'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs',
                               user='hdfs',
                               )
@@ -305,9 +299,6 @@ class TestNamenode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', 'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertResourceCalled('Execute', "hadoop dfsadmin -safemode get | grep 'Safe mode is OFF'",
                               path = ['/usr/bin'],
                               tries = 40,
@@ -382,9 +373,6 @@ class TestNamenode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-namenode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', 'hdfs dfsadmin -report -live',
-                              user='hdfs',
-                              )
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/hdfs.headless.keytab hdfs',
         user = 'hdfs',
     )

+ 0 - 6
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py

@@ -70,9 +70,6 @@ class TestSNamenode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', 'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertNoMoreResources()
 
   def test_stop_default(self):
@@ -154,9 +151,6 @@ class TestSNamenode(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-secondarynamenode.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', 'hdfs dfsadmin -report -live',
-                              user='hdfs'
-                              )
     self.assertNoMoreResources()
 
   def test_stop_secured(self):

+ 0 - 4
ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py

@@ -80,8 +80,6 @@ class TestZkfc(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', "hdfs dfsadmin -report -live",
-                              user="hdfs")
     self.assertNoMoreResources()
 
 
@@ -169,8 +167,6 @@ class TestZkfc(RMFTestCase):
         not_if = 'ls /var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid >/dev/null 2>&1 && ps -p `cat /var/run/hadoop/hdfs/hadoop-hdfs-zkfc.pid` >/dev/null 2>&1',
         user = 'hdfs',
     )
-    self.assertResourceCalled('Execute', "hdfs dfsadmin -report -live",
-                              user="hdfs")
     self.assertNoMoreResources()
 
   def test_stop_secured(self):