diff options
| author | Gaurav Kumar Garg <ggarg@redhat.com> | 2015-03-27 15:20:03 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-05-07 00:08:07 -0700 |
| commit | f9ebf5ab3cbec423f75e64c25385125d4b65e31b (patch) | |
| tree | bc2d9d1c0698371d1480c2e0eae09c61e248e61f /cli/src/cli-cmd-volume.c | |
| parent | 2d919eab43dfbcfbaa2617b161f3f4bdd1381e96 (diff) | |
glusterd: remove replace brick with data migration support form cli/glusterd
Replace-brick operation with data migration support have been
deprecated from gluster.
With this fix replace brick command will support only one commad
gluster volume replace-brick <VOLNAME> <SOURCE-BRICK> <NEW-BRICK> {commit force}
Change-Id: Ib81d49e5d8e7eaa4ccb5830cfec2bc081191b43b
BUG: 1218602
Signed-off-by: Gaurav Kumar Garg <ggarg@redhat.com>
Reviewed-on: http://review.gluster.org/10577
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System
Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'cli/src/cli-cmd-volume.c')
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index c731284cdfe..6458d04208d 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -1584,18 +1584,13 @@ cli_cmd_volume_replace_brick_cbk (struct cli_state *state, const char **words, int wordcount) { - int ret = -1; - rpc_clnt_procedure_t *proc = NULL; - call_frame_t *frame = NULL; + int ret = -1; + rpc_clnt_procedure_t *proc = NULL; + call_frame_t *frame = NULL; dict_t *options = NULL; - int sent = 0; - int parse_error = 0; + int sent = 0; + int parse_error = 0; cli_local_t *local = NULL; - int replace_op = 0; - char *q = "All replace-brick commands except " - "commit force are deprecated. " - "Do you want to continue?"; - gf_answer_t answer = GF_ANSWER_NO; #ifdef GF_SOLARIS_HOST_OS cli_out ("Command not supported on Solaris"); @@ -1615,24 +1610,6 @@ cli_cmd_volume_replace_brick_cbk (struct cli_state *state, goto out; } - ret = dict_get_int32 (options, "operation", &replace_op); - if (replace_op != GF_REPLACE_OP_COMMIT_FORCE) { - answer = cli_cmd_get_confirmation (state, q); - if (GF_ANSWER_NO == answer) { - ret = 0; - goto out; - } - } - - if (state->mode & GLUSTER_MODE_WIGNORE) { - ret = dict_set_int32 (options, "force", _gf_true); - if (ret) { - gf_log ("cli", GF_LOG_ERROR, "Failed to set force" - "option"); - goto out; - } - } - CLI_LOCAL_INIT (local, words, frame, options); if (proc->fn) { @@ -2532,7 +2509,8 @@ struct cli_cmd volume_cmds[] = { cli_cmd_volume_defrag_cbk, "rebalance operations"}, - { "volume replace-brick <VOLNAME> <BRICK> <NEW-BRICK> {start [force]|pause|abort|status|commit [force]}", + { "volume replace-brick <VOLNAME> <SOURCE-BRICK> <NEW-BRICK> " + "{commit force}", cli_cmd_volume_replace_brick_cbk, "replace-brick operations"}, |