You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by rl...@apache.org on 2015/11/13 04:56:06 UTC
[2/2] incubator-hawq git commit: HAWQ-40. Refact hawq standby init.
Updated GUC name.
HAWQ-40. Refact hawq standby init. Updated GUC name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/2561ab74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/2561ab74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/2561ab74
Branch: refs/heads/master
Commit: 2561ab74d9bcbe45c33d148d18ba0a7204cb80a4
Parents: d0c9c1d
Author: rlei <rl...@pivotal.io>
Authored: Fri Nov 13 11:45:25 2015 +0800
Committer: stanlyxiang <st...@gmail.com>
Committed: Fri Nov 13 11:55:27 2015 +0800
----------------------------------------------------------------------
tools/bin/hawq_ctl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/2561ab74/tools/bin/hawq_ctl
----------------------------------------------------------------------
diff --git a/tools/bin/hawq_ctl b/tools/bin/hawq_ctl
index 4890cd4..334e78a 100755
--- a/tools/bin/hawq_ctl
+++ b/tools/bin/hawq_ctl
@@ -148,12 +148,12 @@ class HawqInit:
return result
def set_vsegment_num_per_node(self):
- cmd = "%s; hawq config -c hawq_resourcemanager_query_vsegment_number_per_segment_limit \
+ cmd = "%s; hawq config -c hawq_rm_nvseg_perquery_perseg_limit \
-v %s --skipvalidation -q > /dev/null" % \
(source_hawq_env, self.vseg_num_per_node)
result = local_ssh(cmd, logger)
if result != 0:
- logger.warn("Set hawq_resourcemanager_query_vsegment_number_per_segment_limit failed")
+ logger.warn("Set hawq_rm_nvseg_perquery_perseg_limit failed")
return result
def _get_master_init_cmd(self):
@@ -307,7 +307,7 @@ class HawqInit:
else:
logger.info("Segments init successfully on nodes '%s'" % self.host_list)
- if self.standby_host_name not in ('', 'None', 'none', 'NONE'):
+ if self.standby_host_name.lower() not in ('', 'none'):
check_return_code(self._init_standby(), logger, \
"Init standby failed, exit", \
"Init standby successfully")
@@ -329,7 +329,7 @@ class HawqInit:
logger.info("Try to remove standby master")
self.hawq_remove_standby()
elif self.node_type == "standby":
- if self.standby_host_name in ('', 'None', 'none', 'NONE'):
+ if self.standby_host_name.lower() in ('', 'none'):
logger.info("No standby host found")
logger.info("Please check your standby host name")
sys.exit(1)
@@ -452,7 +452,7 @@ class HawqStart:
def _start_all_nodes(self):
logger.info("Start all the nodes in hawq cluster")
- if self.standby_host_name not in ('', 'None', 'none', 'NONE'):
+ if self.standby_host_name.lower() not in ('', 'none'):
logger.info("Starting standby master '%s'" % self.standby_host_name)
check_return_code(self.start_standby(), logger, "Standby master start failed, exit",
"Standby master started successfully")
@@ -630,7 +630,7 @@ class HawqStop:
logger.error("Master stop failed")
else:
logger.info("Master stopped successfully")
- if self.standby_host_name not in ('', 'None', 'none', 'NONE'):
+ if self.standby_host_name.lower() not in ('', 'none'):
result = self._stop_standby()
if result != 0:
logger.error("Standby master stop failed")