diff options
| author | Manikandan Selvaganesh <mselvaga@redhat.com> | 2015-10-05 12:59:18 +0530 |
|---|---|---|
| committer | Dan Lambright <dlambrig@redhat.com> | 2015-10-08 04:47:42 -0700 |
| commit | 37a553575ff8df7ede86e3c69fb48d77bfaccafe (patch) | |
| tree | 2adfe3304b58d76fe70a07aa64a1df6fc7d8d4c6 | |
| parent | 4cf1e84ec80fc58f6f978165a81fd8acbcc648f8 (diff) | |
tier/cli : throw a warning when user issues a detach-tier commit/force
command
Backport of http://review.gluster.org/#/c/12297/
> Change-Id: Idf7664d509156ce46ef4308ffc07fb556a0aedd2
> BUG: 1268755
> Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com>
> Reviewed-on: http://review.gluster.org/12297
> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: mohammed rafi kc <rkavunga@redhat.com>
> Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Change-Id: Idf7664d509156ce46ef4308ffc07fb556a0aedd2
BUG: 1269035
Signed-off-by: Manikandan Selvaganesh <mselvaga@redhat.com>
Reviewed-on: http://review.gluster.org/12305
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.c | 4 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 3 | ||||
| -rw-r--r-- | cli/src/cli.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index ffe945b0fac..ab18aa1ae6d 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -1762,7 +1762,7 @@ out: int32_t cli_cmd_volume_detach_tier_parse (const char **words, int wordcount, - dict_t **options) + dict_t **options, int *question) { int ret = -1; char *word = NULL; @@ -1794,8 +1794,10 @@ 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")) { + *question = 1; command = GF_OP_CMD_DETACH_COMMIT; } else if (!strcmp(word, "force")) { + *question = 1; command = GF_OP_CMD_DETACH_COMMIT_FORCE; } else if (!strcmp(word, "stop")) command = GF_OP_CMD_STOP_DETACH_TIER; diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 4f71e21822a..c23f31b83e3 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -1001,7 +1001,8 @@ do_cli_cmd_volume_detach_tier (struct cli_state *state, if (!frame) goto out; - ret = cli_cmd_volume_detach_tier_parse(words, wordcount, &options); + ret = cli_cmd_volume_detach_tier_parse(words, wordcount, &options, + &need_question); if (ret) { cli_usage_out (word->pattern); parse_error = 1; diff --git a/cli/src/cli.h b/cli/src/cli.h index ccf55761870..59315797eef 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -274,7 +274,7 @@ cli_cmd_volume_add_brick_parse (const char **words, int wordcount, int32_t cli_cmd_volume_detach_tier_parse (const char **words, int wordcount, - dict_t **options); + dict_t **options, int *question); int32_t cli_cmd_volume_tier_parse (const char **words, int wordcount, |