summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammed Rafi KC <rkavunga@redhat.com>2015-09-10 16:07:29 +0530
committerDan Lambright <dlambrig@redhat.com>2015-09-22 04:57:43 -0700
commit68e8d617eb62a7ec40a1db5f3f60730767a168b6 (patch)
treeea3408163725d59e8281f1a4f374f2982f91bf72
parentab667778ed7c5016d32090b98b69b3ef0c528788 (diff)
Tier/cli: Change detach-tier commit force to detach-tier force
Current detach-tier cli command support commit force. Deprecating the same to force. So the new syntax would be: volume detach-tier <VOLNAME> <start|stop|status|commit|force> Change-Id: Ie86dfd72341078c0a1be94767f523730911312ef BUG: 1261862 Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com> Reviewed-on: http://review.gluster.org/12151 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Dan Lambright <dlambrig@redhat.com> Tested-by: Dan Lambright <dlambrig@redhat.com>
-rw-r--r--cli/src/cli-cmd-parser.c19
-rw-r--r--cli/src/cli-cmd-volume.c2
-rw-r--r--tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-brick-ops.c2
4 files changed, 7 insertions, 18 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index bd931ded3e0..2ca7707d722 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -1777,21 +1777,11 @@ cli_cmd_volume_detach_tier_parse (const char **words, int wordcount,
return -1;
}
- if (!((wordcount == 4) || (wordcount == 5))) {
+ if (wordcount != 4) {
ret = -1;
goto out;
}
- if (wordcount == 5) {
- word = (char *)words[4];
- if (!strcmp(word, "force"))
- force = 1;
- else {
- ret = -1;
- goto out;
- }
- }
-
word = (char *)words[3];
ret = -1;
@@ -1799,10 +1789,9 @@ cli_cmd_volume_detach_tier_parse (const char **words, int wordcount,
if (!strcmp(word, "start")) {
command = GF_OP_CMD_DETACH_START;
} else if (!strcmp(word, "commit")) {
- if (force)
- command = GF_OP_CMD_DETACH_COMMIT_FORCE;
- else
- command = GF_OP_CMD_DETACH_COMMIT;
+ command = GF_OP_CMD_DETACH_COMMIT;
+ } else if (!strcmp(word, "force")) {
+ command = GF_OP_CMD_DETACH_COMMIT_FORCE;
} else if (!strcmp(word, "stop"))
command = GF_OP_CMD_STOP_DETACH_TIER;
else if (!strcmp(word, "status"))
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index fa9e965881b..a265b38aaaa 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -2670,7 +2670,7 @@ struct cli_cmd volume_cmds[] = {
"[<replica COUNT>] <NEW-BRICK>..."},
{ "volume detach-tier <VOLNAME> "
- " <start|stop|status|commit|[force]>",
+ " <start|stop|status|commit|force>",
cli_cmd_volume_tier_cbk,
"NOTE: this is old syntax, will be depreciated in next release. "
"Please use gluster volume tier <vol> detach "
diff --git a/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t b/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
index 220216ec509..4ef4c9d14ad 100644
--- a/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
+++ b/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
@@ -27,7 +27,7 @@ TEST ! $CLI volume detach-tier $V0 commit
## detach-tier commit operation with force option on volume $V0
## should succeed
-TEST $CLI volume detach-tier $V0 commit force
+TEST $CLI volume detach-tier $V0 force
## Again performing attach-tier operation on volume $V0
TEST $CLI volume attach-tier $V0 $H0:$B0/${V0}{5..6}
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index fda4a81beae..8b69924f9d7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -1740,7 +1740,7 @@ glusterd_remove_brick_validate_bricks (gf1_op_commands cmd, int32_t brick_count,
snprintf (msg, sizeof (msg), "Brick's in Hot "
"tier is not decommissioned yet. Use "
"gluster volume detach-tier <VOLNAME>"
- " <start | commit | [force]>"
+ " <start | commit | force>"
" command instead");
*errstr = gf_strdup (msg);
ret = -1;