Repository: ambari Updated Branches: refs/heads/trunk 473c583c2 -> e59089b40
AMBARI-10449. NameNode cannot to start on cluster installed via blueprint with NN HA enabled Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e59089b4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e59089b4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e59089b4 Branch: refs/heads/trunk Commit: e59089b40fbc08ef247ecbba5501bf28ab45920b Parents: 473c583 Author: Sumit Mohanty <[email protected]> Authored: Fri Apr 10 19:17:22 2015 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Apr 10 19:17:22 2015 -0700 ---------------------------------------------------------------------- .../HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py | 2 ++ .../main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml | 2 +- .../src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py | 1 + .../src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py | 1 + .../test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py | 1 + .../src/test/python/stacks/2.0.6/HDFS/test_namenode.py | 6 ++++++ 6 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e59089b4/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py index d1e56b5..e36019e 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py +++ b/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], ) http://git-wip-us.apache.org/repos/asf/ambari/blob/e59089b4/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml index 6ca83d5..c3f1cc1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/ambari/blob/e59089b4/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py index 370aca0..58c661b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_client.py +++ b/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" http://git-wip-us.apache.org/repos/asf/ambari/blob/e59089b4/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py index 36c942e..48431cf 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py +++ b/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" http://git-wip-us.apache.org/repos/asf/ambari/blob/e59089b4/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py index 8a79701..b870bd8 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_regionserver.py +++ b/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" http://git-wip-us.apache.org/repos/asf/ambari/blob/e59089b4/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 70e68e2..32a3ae3 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 @@ -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'",
