ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhuvnesh2...@apache.org
Subject ambari git commit: AMBARI-15930: hawq init master fails to syncup hawq-site xml if there is a segment host down (bhuvnesh2703)
Date Sat, 16 Apr 2016 07:07:13 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2.2 d59eee68d -> 25baf944f


AMBARI-15930: hawq init master fails to syncup hawq-site xml if there is a segment host down
(bhuvnesh2703)


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

Branch: refs/heads/branch-2.2.2
Commit: 25baf944f0f19ff6d4e312d050fc55195b787916
Parents: d59eee6
Author: Bhuvnesh Chaudhary <bchaudhary@pivotal.io>
Authored: Sat Apr 16 00:09:38 2016 -0700
Committer: Bhuvnesh Chaudhary <bchaudhary@pivotal.io>
Committed: Sat Apr 16 00:09:38 2016 -0700

----------------------------------------------------------------------
 .../common-services/HAWQ/2.0.0/package/scripts/common.py        | 5 ++++-
 .../src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/25baf944/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
index b929430..0ab2afb 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/common.py
@@ -296,7 +296,10 @@ def start_component(component_name, port, data_dir):
                                      "{0} -a -v".format(component_name),
                                      not_if=utils.generate_hawq_process_status_cmd(component_name,
port))
 
-  utils.exec_hawq_operation(hawq_constants.INIT, "{0} -a -v".format(component_name))
+  options_str = "{0} -a -v".format(component_name)
+  if component_name == hawq_constants.MASTER:
+    options_str+=" --ignore-bad-hosts"
+  utils.exec_hawq_operation(hawq_constants.INIT, options_str)
 
 def stop_component(component_name, mode):
   """

http://git-wip-us.apache.org/repos/asf/ambari/blob/25baf944/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py
index 5f7f085..e34a4c5 100644
--- a/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py
+++ b/ambari-server/src/test/python/stacks/2.3/HAWQ/test_hawqmaster.py
@@ -188,7 +188,7 @@ class TestHawqMaster(RMFTestCase):
         principal_name = UnknownConfigurationMock()
         )
 
-    self.assertResourceCalled('Execute', 'source /usr/local/hawq/greenplum_path.sh &&
hawq init master -a -v',
+    self.assertResourceCalled('Execute', 'source /usr/local/hawq/greenplum_path.sh &&
hawq init master -a -v --ignore-bad-hosts',
         logoutput = True, 
         not_if = None, 
         only_if = None, 


Mime
View raw message