Explorar o código

AMBARI-10449. NameNode cannot to start on cluster installed via blueprint with NN HA enabled

Sumit Mohanty %!s(int64=10) %!d(string=hai) anos
pai
achega
e59089b40f

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

@@ -103,6 +103,8 @@ def namenode(action=None, do_format=True, rolling_restart=False, env=None):
       if code != 0:
         leave_safe_mode_cmd = format("hdfs --config {hadoop_conf_dir} dfsadmin -fs {namenode_address} -safemode leave")
         Execute(leave_safe_mode_cmd,
+                tries=10,
+                try_sleep=10,
                 user=params.hdfs_user,
                 path=[params.hadoop_bin_dir],
         )

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml

@@ -20,7 +20,7 @@
   <services>
     <service>
       <name>SLIDER</name>
-      <version>0.61.0.2.3</version>
+      <version>0.72.0.2.3</version>
       <osSpecifics>
         <osSpecific>
           <osFamily>redhat7,redhat6,suse11</osFamily>

+ 1 - 0
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py

@@ -20,6 +20,7 @@ limitations under the License.
 from mock.mock import MagicMock, call, patch
 from stacks.utils.RMFTestCase import *
 
+@patch("platform.linux_distribution", new = MagicMock(return_value="Linux"))
 @patch("os.path.exists", new = MagicMock(return_value=True))
 class TestHBaseClient(RMFTestCase):
   COMMON_SERVICES_PACKAGE_DIR = "HBASE/0.96.0.2.0/package"

+ 1 - 0
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py

@@ -20,6 +20,7 @@ limitations under the License.
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
+@patch("platform.linux_distribution", new = MagicMock(return_value="Linux"))
 @patch("os.path.exists", new = MagicMock(return_value=True))
 class TestHBaseMaster(RMFTestCase):
   COMMON_SERVICES_PACKAGE_DIR = "HBASE/0.96.0.2.0/package"

+ 1 - 0
ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py

@@ -20,6 +20,7 @@ limitations under the License.
 from mock.mock import MagicMock, patch
 from stacks.utils.RMFTestCase import *
 
+@patch("platform.linux_distribution", new = MagicMock(return_value="Linux"))
 @patch("os.path.exists", new = MagicMock(return_value=True))
 class TestHbaseRegionServer(RMFTestCase):
   COMMON_SERVICES_PACKAGE_DIR = "HBASE/0.96.0.2.0/package"

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

@@ -89,6 +89,8 @@ class TestNamenode(RMFTestCase):
                               )
     self.assertResourceCalled('Execute', 'hdfs --config /etc/hadoop/conf dfsadmin -fs hdfs://c6405.ambari.apache.org:8020 -safemode leave',
                               path = ['/usr/bin'],
+                              tries = 10,
+                              try_sleep = 10,
                               user = 'hdfs',
                               )
     self.assertResourceCalled('Execute', "hadoop dfsadmin -fs hdfs://c6405.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
@@ -179,6 +181,8 @@ class TestNamenode(RMFTestCase):
     )
     self.assertResourceCalled('Execute', 'hdfs --config /etc/hadoop/conf dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode leave',
         path = ['/usr/bin'],
+        tries = 10,
+        try_sleep = 10,
         user = 'hdfs',
     )
     self.assertResourceCalled('Execute', "hadoop dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",
@@ -304,6 +308,8 @@ class TestNamenode(RMFTestCase):
                               )
     self.assertResourceCalled('Execute', 'hdfs --config /etc/hadoop/conf dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode leave',
         path = ['/usr/bin'],
+        tries = 10,
+        try_sleep = 10,
         user = 'hdfs',
     )
     self.assertResourceCalled('Execute', "hadoop dfsadmin -fs hdfs://c6401.ambari.apache.org:8020 -safemode get | grep 'Safe mode is OFF'",