summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrishnan Parthasarathi <kp@gluster.com>2012-01-09 17:03:21 +0530
committerVijay Bellur <vijay@gluster.com>2012-01-10 06:34:53 -0800
commit836c5f0075e83816d00003da440d5c728aefb93e (patch)
treecf9e1b53f29471b5697613570b3b3a3257e423ab
parent979e12f16b57cbb848fb9096d673dc58ed9b67a4 (diff)
cli: Corrected replace-brick error messages and usage string.
Change-Id: I2739529ca572fd762fbbed27de9e433e8c5b1f81 BUG: 772583 Signed-off-by: Krishnan Parthasarathi <kp@gluster.com> Reviewed-on: http://review.gluster.com/2613 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
-rw-r--r--cli/src/cli-cmd-parser.c9
-rw-r--r--cli/src/cli-cmd-volume.c2
2 files changed, 7 insertions, 4 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index 17f03bb1c4e..fa46fa06671 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -1122,6 +1122,7 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
GF_ASSERT (!"opword mismatch");
/* commit force option */
+
op_index = 6;
if (wordcount > (op_index + 1)) {
@@ -1130,6 +1131,10 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
}
if (wordcount == (op_index + 1)) {
+ if (replace_op != GF_REPLACE_OP_COMMIT) {
+ ret = -1;
+ goto out;
+ }
if (!strcmp ("force", words[op_index])) {
replace_op = GF_REPLACE_OP_COMMIT_FORCE;
}
@@ -1146,13 +1151,11 @@ cli_cmd_volume_replace_brick_parse (const char **words, int wordcount,
goto out;
-
-
*options = dict;
out:
if (ret) {
- gf_log ("cli", GF_LOG_ERROR, "Unable to parse remove-brick CLI");
+ gf_log ("cli", GF_LOG_ERROR, "Unable to parse replace-brick CLI");
if (dict)
dict_destroy (dict);
}
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index 2336dfe4434..009896d9ce4 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -1548,7 +1548,7 @@ struct cli_cmd volume_cmds[] = {
cli_cmd_volume_defrag_cbk,
"rebalance operations"},
- { "volume replace-brick <VOLNAME> <BRICK> <NEW-BRICK> {start|pause|abort|status|commit}",
+ { "volume replace-brick <VOLNAME> <BRICK> <NEW-BRICK> {start|pause|abort|status|commit [force]}",
cli_cmd_volume_replace_brick_cbk,
"replace-brick operations"},