diff options
| author | shishir gowda <shishirng@gluster.com> | 2012-04-11 15:30:22 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-04-13 00:46:59 -0700 |
| commit | bada6aeb2cabd12a11b0fe17bb01e9f2045b013d (patch) | |
| tree | 52482d74a792309afd753e0942e561cb0e8eb8bf /cli | |
| parent | d80846bee0621f591a7b519743e4d91a620ccdca (diff) | |
glusterd/remove-brick: Replace ABORT with STOP
Remove-brick stop now invokes rebalance stop. This leads
to a graceful stop of decommissioning.
The volfile is also updated (removal of decommission)
Change-Id: I5a8f725c0f54439b810ce32d988c21c02229c703
BUG: 811513
Signed-off-by: shishir gowda <shishirng@gluster.com>
Reviewed-on: http://review.gluster.com/3126
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 6 | ||||
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index dd7ab03bd..2aba56b9b 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -849,7 +849,7 @@ cli_cmd_volume_remove_brick_parse (const char **words, int wordcount, char *tmp_brick = NULL; char *tmp_brick1 = NULL; char *type_opword[] = { "replica", NULL }; - char *opwords[] = { "start", "commit", "abort", "status", + char *opwords[] = { "start", "commit", "stop", "status", "force", NULL }; char *w = NULL; int32_t command = GF_OP_CMD_NONE; @@ -911,8 +911,8 @@ cli_cmd_volume_remove_brick_parse (const char **words, int wordcount, command = GF_OP_CMD_COMMIT; if (question) *question = 1; - } else if (!strcmp ("abort", w)) { - command = GF_OP_CMD_ABORT; + } else if (!strcmp ("stop", w)) { + command = GF_OP_CMD_STOP; } else if (!strcmp ("status", w)) { command = GF_OP_CMD_STATUS; } else if (!strcmp ("force", w)) { diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 1ecb562bd..a7450c32e 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -1592,9 +1592,6 @@ gf_cli3_1_remove_brick_cbk (struct rpc_req *req, struct iovec *iov, case GF_OP_CMD_COMMIT: cmd_str = "commit"; break; - case GF_OP_CMD_ABORT: - cmd_str = "abort"; - break; case GF_OP_CMD_COMMIT_FORCE: cmd_str = "commit force"; break; @@ -2897,7 +2894,8 @@ gf_cli3_1_remove_brick (call_frame_t *frame, xlator_t *this, if (ret) goto out; - if (command != GF_OP_CMD_STATUS) { + if ((command != GF_OP_CMD_STATUS) && + (command != GF_OP_CMD_STOP)) { ret = dict_allocate_and_serialize (dict, &req.dict.dict_val, @@ -2927,7 +2925,10 @@ gf_cli3_1_remove_brick (call_frame_t *frame, xlator_t *this, goto out; } - cmd |= GF_DEFRAG_CMD_STATUS; + if (command == GF_OP_CMD_STATUS) + cmd |= GF_DEFRAG_CMD_STATUS; + else + cmd |= GF_DEFRAG_CMD_STOP; ret = dict_set_int32 (req_dict, "rebalance-command", (int32_t) cmd); if (ret) { |