[sheepdog] [PATCH] collie: remove cluster cleanup command

Liu Yuan namei.unix at gmail.com
Tue Aug 28 05:17:08 CEST 2012


From: Liu Yuan <tailai.ly at taobao.com>

We for now automatically clean up useless objects generated from
recovery process.

Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
 collie/cluster.c |   19 -------------------
 man/collie.8     |    5 +----
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/collie/cluster.c b/collie/cluster.c
index d34d26c..fe2393f 100644
--- a/collie/cluster.c
+++ b/collie/cluster.c
@@ -335,22 +335,6 @@ static int cluster_snapshot(int argc, char **argv)
 	return ret;
 }
 
-static int cluster_cleanup(int argc, char **argv)
-{
-	int ret;
-	struct sd_req hdr;
-
-	sd_init_req(&hdr, SD_OP_CLEANUP);
-
-	ret = send_light_req(&hdr, sdhost, sdport);
-	if (ret) {
-		fprintf(stderr, "failed to execute request\n");
-		return EXIT_FAILURE;
-	}
-
-	return EXIT_SUCCESS;
-}
-
 #define RECOVER_PRINT \
 "Caution! Please try starting all the cluster nodes normally before\n\
 running this command.\n\n\
@@ -519,9 +503,6 @@ static struct subcommand cluster_cmd[] = {
 	 NULL, SUBCMD_FLAG_NEED_NODELIST, cluster_shutdown, cluster_options},
 	{"snapshot", NULL, "aRlph", "snapshot/restore the cluster",
 	 NULL, 0, cluster_snapshot, cluster_options},
-	{"cleanup", NULL, "aph",
-	 "cleanup the useless data genereated from recovery",
-	 NULL, 0, cluster_cleanup, cluster_options},
 	{"recover", NULL, "afph",
 	 "See 'collie cluster recover' for more information\n",
 	 cluster_recover_cmd, SUBCMD_FLAG_NEED_THIRD_ARG,
diff --git a/man/collie.8 b/man/collie.8
index 359c409..eb16795 100644
--- a/man/collie.8
+++ b/man/collie.8
@@ -138,12 +138,9 @@ Enable automatic recovery and run once recover if necessary.
 .TP
 .BI "cluster recover disable [-a address] [-f] [-p port] [-h]"
 Disable automatic recovery caused by JOIN events (excluding LEAVE events now).
-.TP
-.BI "cluster cleanup [-a address] [-p port] [-h]"
-This command cleans up unwanted snapshot data after recovery.
 
 .SH DEPENDENCIES
-\fBSheepdog\fP requires QEMU 0.13.z or later and Corosync 1.y.z.
+\fBSheepdog\fP requires QEMU 0.13.z or later and Corosync 1.y.z or 2.y.z.
 
 .SH FILES
 none
-- 
1.7.10.2




More information about the sheepdog mailing list