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-468. HAWQ remove standby should keep the empty data folder
Date Mon, 29 Feb 2016 02:39:06 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 3dee17c91 -> 98e6c144c


HAWQ-468. HAWQ remove standby should keep the empty data folder


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

Branch: refs/heads/master
Commit: 98e6c144c3210f91eb63c9173b1d3d8fa2af3740
Parents: 3dee17c
Author: rlei <rlei@pivotal.io>
Authored: Sun Feb 28 23:36:56 2016 +0800
Committer: rlei <rlei@pivotal.io>
Committed: Mon Feb 29 10:32:06 2016 +0800

----------------------------------------------------------------------
 tools/bin/hawq_ctl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/98e6c144/tools/bin/hawq_ctl
----------------------------------------------------------------------
diff --git a/tools/bin/hawq_ctl b/tools/bin/hawq_ctl
index 89e7221..9a38bf3 100755
--- a/tools/bin/hawq_ctl
+++ b/tools/bin/hawq_ctl
@@ -278,10 +278,10 @@ class HawqInit:
 
             tmp_dir_list = self.hawq_master_temp_directory.replace(',', ' ')
 
-            logger.debug("rm -rf %s %s" % (self.master_data_directory, tmp_dir_list))
-            cmd = "rm -rf %s %s" % (self.master_data_directory, tmp_dir_list)
+            logger.debug("rm -rf %s/* %s/*" % (self.master_data_directory, tmp_dir_list))
+            cmd = "rm -rf %s/* %s/*" % (self.master_data_directory, tmp_dir_list)
             check_return_code(remote_ssh(cmd, self.standby_host_name, self.user), logger,
\
-                              "Delete standby master's directories failed, exit")
+                              "Delete standby master's files failed, exit")
             signal.signal(signal.SIGINT,signal.default_int_handler)
             logger.info('Remove standby master finished')
         else:


Mime
View raw message