hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject incubator-hawq git commit: HAWQ-586. HAWQ stop do not check connections while use immediate mode
Date Fri, 25 Mar 2016 02:22:23 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 90e3dd470 -> 53fef5454


HAWQ-586. HAWQ stop do not check connections while use immediate mode


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/53fef545
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/53fef545
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/53fef545

Branch: refs/heads/master
Commit: 53fef54541116e4c437ba8ad3e47ca9970d227fe
Parents: 90e3dd4
Author: rlei <rlei@pivotal.io>
Authored: Thu Mar 24 10:18:08 2016 +0800
Committer: rlei <rlei@pivotal.io>
Committed: Fri Mar 25 10:21:44 2016 +0800

----------------------------------------------------------------------
 tools/bin/hawq_ctl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/53fef545/tools/bin/hawq_ctl
----------------------------------------------------------------------
diff --git a/tools/bin/hawq_ctl b/tools/bin/hawq_ctl
index aeb871b..0d2aa09 100755
--- a/tools/bin/hawq_ctl
+++ b/tools/bin/hawq_ctl
@@ -715,6 +715,7 @@ class HawqStop:
             logger.info("There are %d connections to the database" % total_connections)
         except DatabaseError, ex:
             logger.error("Failed to connect to the running database, please check master
status")
+            logger.error("Or you can check hawq stop --help for other stop options")
             sys.exit(1)
 
         if total_connections > 0 and self.stop_mode=='smart':
@@ -757,7 +758,8 @@ class HawqStop:
     def _stop_master(self):
         master_host, master_running = check_hawq_running(self.master_host_name, self.master_data_directory,
self.master_port, self.user, logger)
         if master_running:
-            self._stop_master_checks()
+            if self.stop_mode != 'immediate':
+                self._stop_master_checks()
             cmd = self._stop_master_cmd()
             result = remote_ssh(cmd, self.master_host_name, self.user)
             return result


Mime
View raw message