You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by wl...@apache.org on 2017/03/21 05:55:25 UTC
incubator-hawq git commit: HAWQ-1393. 'hawq stop cluster' failed when
rps.sh have some path errors (e.g. CATALINA_HOME)
Repository: incubator-hawq
Updated Branches:
refs/heads/master 13df9e1a7 -> 19a7b22b6
HAWQ-1393. 'hawq stop cluster' failed when rps.sh have some path errors (e.g. CATALINA_HOME)
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/19a7b22b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/19a7b22b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/19a7b22b
Branch: refs/heads/master
Commit: 19a7b22b6126c14612cd63f50b203d22448510db
Parents: 13df9e1
Author: interma <in...@outlook.com>
Authored: Mon Mar 20 17:08:34 2017 +0800
Committer: interma <in...@outlook.com>
Committed: Mon Mar 20 17:08:34 2017 +0800
----------------------------------------------------------------------
tools/bin/hawq_ctl | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/19a7b22b/tools/bin/hawq_ctl
----------------------------------------------------------------------
diff --git a/tools/bin/hawq_ctl b/tools/bin/hawq_ctl
index 976ba92..acfb0c3 100755
--- a/tools/bin/hawq_ctl
+++ b/tools/bin/hawq_ctl
@@ -964,8 +964,8 @@ class HawqStop:
if self.hawq_acl_type == 'ranger':
self.stop_rps()
if self.hawq_acl_type == 'unknown':
- logger.warning("try to stop RPS when hawq_acl_type is unknown")
- self.stop_rps()
+ logger.warning("Try to stop RPS when hawq_acl_type is unknown")
+ self.stop_rps(check_ret = False)
# Execute segment stop command on each node.
segments_return_flag = self._stopAllSegments()
@@ -1046,9 +1046,11 @@ class HawqStop:
result = remote_ssh(cmd_str, self.master_host_name, self.user)
return result
- def stop_rps(self):
+ def stop_rps(self, check_ret = True):
logger.info("Stop Ranger plugin service")
- check_return_code(self._stop_rps(), logger, \
+ result = self._stop_rps()
+ if check_ret:
+ check_return_code(result, logger, \
"Ranger plugin service stop failed, exit", "Ranger plugin service stopped successfully")
def run(self):
@@ -1058,8 +1060,8 @@ class HawqStop:
if self.hawq_acl_type == 'ranger':
self.stop_rps()
if self.hawq_acl_type == 'unknown':
- logger.warning("try to stop RPS when hawq_acl_type is unknown")
- self.stop_rps()
+ logger.warning("Try to stop RPS when hawq_acl_type is unknown")
+ self.stop_rps(check_ret = False)
elif self.node_type == "standby":
if self.standby_host_name.lower() not in ('', 'none'):
check_return_code(self._stop_standby(), logger, \