diff options
| author | shishir gowda <shishirng@gluster.com> | 2012-04-11 12:11:06 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-04-13 00:26:33 -0700 |
| commit | c2ebd7aa84ed666ac8d1f0e9424cd01f877fb53b (patch) | |
| tree | c66594575b3798b439c5e1b28c4b512ac4b502fc | |
| parent | c238e5073a8d60fede1f88e584c14de42885276e (diff) | |
glusterd/remove-brick: Remove support for pause option
Decommissioning through rebalance has no pause option.
Change-Id: I90f165cdb2eccfaefc99365ae4b48d81320fb753
BUG: 811459
Signed-off-by: shishir gowda <shishirng@gluster.com>
Reviewed-on: http://review.gluster.com/3123
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 4 | ||||
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 3 | ||||
| -rw-r--r-- | rpc/xdr/src/cli1-xdr.h | 7 | ||||
| -rw-r--r-- | rpc/xdr/src/cli1-xdr.x | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 18 |
5 files changed, 4 insertions, 29 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 6c2cff396..dd7ab03bd 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", "pause", "abort", "status", + char *opwords[] = { "start", "commit", "abort", "status", "force", NULL }; char *w = NULL; int32_t command = GF_OP_CMD_NONE; @@ -911,8 +911,6 @@ cli_cmd_volume_remove_brick_parse (const char **words, int wordcount, command = GF_OP_CMD_COMMIT; if (question) *question = 1; - } else if (!strcmp ("pause", w)) { - command = GF_OP_CMD_PAUSE; } else if (!strcmp ("abort", w)) { command = GF_OP_CMD_ABORT; } else if (!strcmp ("status", w)) { diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index 4deb14e6e..1ecb562bd 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -1595,9 +1595,6 @@ gf_cli3_1_remove_brick_cbk (struct rpc_req *req, struct iovec *iov, case GF_OP_CMD_ABORT: cmd_str = "abort"; break; - case GF_OP_CMD_PAUSE: - cmd_str = "pause"; - break; case GF_OP_CMD_COMMIT_FORCE: cmd_str = "commit force"; break; diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h index 6b6458b70..638a4ad75 100644 --- a/rpc/xdr/src/cli1-xdr.h +++ b/rpc/xdr/src/cli1-xdr.h @@ -83,10 +83,9 @@ enum gf1_op_commands { GF_OP_CMD_NONE = 0, GF_OP_CMD_START = 0 + 1, GF_OP_CMD_COMMIT = 0 + 2, - GF_OP_CMD_PAUSE = 0 + 3, - GF_OP_CMD_ABORT = 0 + 4, - GF_OP_CMD_STATUS = 0 + 5, - GF_OP_CMD_COMMIT_FORCE = 0 + 6, + GF_OP_CMD_ABORT = 0 + 3, + GF_OP_CMD_STATUS = 0 + 4, + GF_OP_CMD_COMMIT_FORCE = 0 + 5, }; typedef enum gf1_op_commands gf1_op_commands; diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index d90aa2039..8b8c1920b 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -35,7 +35,6 @@ GF_OP_CMD_NONE = 0, GF_OP_CMD_START, GF_OP_CMD_COMMIT, - GF_OP_CMD_PAUSE, GF_OP_CMD_ABORT, GF_OP_CMD_STATUS, GF_OP_CMD_COMMIT_FORCE diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 300c40a8d..24ddc02ac 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -1256,7 +1256,6 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr) break; } - case GF_OP_CMD_PAUSE: case GF_OP_CMD_ABORT: break; @@ -1493,23 +1492,6 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr) ret = 0; goto out; - case GF_OP_CMD_PAUSE: - { - if (volinfo->decommission_in_progress) { - if (volinfo->defrag) { - LOCK (&volinfo->defrag->lock); - - //volinfo->defrag_status = GF_DEFRAG_STATUS_PAUSED; - - UNLOCK (&volinfo->defrag->lock); - } - } - - /* no need to update anything */ - ret = 0; - goto out; - } - case GF_OP_CMD_ABORT: { if (volinfo->decommission_in_progress) { |