[sheepdog] [PATCH V2 11/11] collie: update doc about 'collie cluster recover disable'
Yunkai Zhang
yunkai.me at gmail.com
Thu Aug 9 10:43:49 CEST 2012
From: Yunkai Zhang <qiushu.zyk at taobao.com>
update relative manual and command's output
Signed-off-by: Yunkai Zhang <qiushu.zyk at taobao.com>
---
collie/cluster.c | 7 +++----
man/collie.8 | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/collie/cluster.c b/collie/cluster.c
index b0b5e95..40653c4 100644
--- a/collie/cluster.c
+++ b/collie/cluster.c
@@ -471,8 +471,7 @@ static int cluster_disable_recover(int argc, char **argv)
if (ret)
return EXIT_FAILURE;
- printf("*Note*: Only disable the recovery caused by JOIN envets\n"
- "Cluster recovery: disable\n");
+ printf("Cluster recovery: disable\n");
return EXIT_SUCCESS;
}
@@ -501,8 +500,8 @@ static struct subcommand cluster_recover_cmd[] = {
{"enable", NULL, NULL, "enable automatic recovery and "
"run once recover if necessary",
NULL, 0, cluster_enable_recover},
- {"disable", NULL, NULL, "disable automatic recovery caused "
- "by JOIN events (excluding LEAVE events now)",
+ {"disable", NULL, NULL, "disable automatic recovery "
+ "casued by both JOIN and LEAVE events",
NULL, 0, cluster_disable_recover},
{NULL},
};
diff --git a/man/collie.8 b/man/collie.8
index 359c409..82c550b 100644
--- a/man/collie.8
+++ b/man/collie.8
@@ -137,7 +137,7 @@ Force recover cluster immediately.
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).
+Disable automatic recovery casued by both JOIN and LEAVE events.
.TP
.BI "cluster cleanup [-a address] [-p port] [-h]"
This command cleans up unwanted snapshot data after recovery.
--
1.7.11.2
More information about the sheepdog
mailing list