andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tier/cli: Change detach-tier commit force to detach-tier force

Browse Source 
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>
This commit is contained in:
Mohammed Rafi KC 2015-09-10 16:07:29 +05:30 committed by Dan Lambright
parent ab667778ed
commit 68e8d617eb
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cli/src/cli-cmd-parser.c
View File

@ -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"))

2
cli/src/cli-cmd-volume.c
View File

@ -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 "

2
tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t
View File

@ -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}

2
xlators/mgmt/glusterd/src/glusterd-brick-ops.c
View File

@ -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;