ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: AMBARI-8501. Datanode fails to start during Install Wizard because Namenode is not up (alejandro)
Date Tue, 02 Dec 2014 03:17:37 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 03872cafa -> 6967f5b02


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6967f5b0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6967f5b0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6967f5b0

Branch: refs/heads/trunk
Commit: 6967f5b02380e55b1a9d4b75c8ea2641388757bc
Parents: 03872ca
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Mon Dec 1 16:00:45 2014 -0800
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Mon Dec 1 18:41:28 2014 -0800

----------------------------------------------------------------------
 .../2.0.6/services/HDFS/package/scripts/utils.py    |  3 +++
 .../test/python/stacks/2.0.6/HDFS/test_datanode.py  | 16 ----------------
 .../python/stacks/2.0.6/HDFS/test_journalnode.py    |  6 ------
 .../test/python/stacks/2.0.6/HDFS/test_namenode.py  | 12 ------------
 .../test/python/stacks/2.0.6/HDFS/test_snamenode.py |  6 ------
 .../src/test/python/stacks/2.0.6/HDFS/test_zkfc.py  |  4 ----
 6 files changed, 3 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6967f5b0/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
index f923b3f..a75f346 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/package/scripts/utils.py
+++ b/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,

http://git-wip-us.apache.org/repos/asf/ambari/blob/6967f5b0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
index b4a86d7..b488080 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
+++ b/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))

http://git-wip-us.apache.org/repos/asf/ambari/blob/6967f5b0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
index 0ba9889..060ac15 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/ambari/blob/6967f5b0/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 d3d5297..d0898de 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
@@ -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',
     )

http://git-wip-us.apache.org/repos/asf/ambari/blob/6967f5b0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
index de13db3..f6fe3e7 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_snamenode.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/ambari/blob/6967f5b0/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
index dcebfab..4532496 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py
+++ b/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):


Mime
View raw message