From bada6aeb2cabd12a11b0fe17bb01e9f2045b013d Mon Sep 17 00:00:00 2001 From: shishir gowda Date: Wed, 11 Apr 2012 15:30:22 +0530 Subject: 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 Reviewed-on: http://review.gluster.com/3126 Reviewed-by: Amar Tumballi Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- cli/src/cli-cmd-parser.c | 6 ++--- cli/src/cli-rpc-ops.c | 11 ++++---- rpc/xdr/src/cli1-xdr.h | 2 +- rpc/xdr/src/cli1-xdr.x | 2 +- xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 19 +++----------- xlators/mgmt/glusterd/src/glusterd-rebalance.c | 36 ++++++++++++++++++++++++++ 6 files changed, 50 insertions(+), 26 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) { diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h index 638a4ad75..234f0f7f7 100644 --- a/rpc/xdr/src/cli1-xdr.h +++ b/rpc/xdr/src/cli1-xdr.h @@ -83,7 +83,7 @@ enum gf1_op_commands { GF_OP_CMD_NONE = 0, GF_OP_CMD_START = 0 + 1, GF_OP_CMD_COMMIT = 0 + 2, - GF_OP_CMD_ABORT = 0 + 3, + GF_OP_CMD_STOP = 0 + 3, GF_OP_CMD_STATUS = 0 + 4, GF_OP_CMD_COMMIT_FORCE = 0 + 5, }; diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index 8b8c1920b..61af3a14c 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -35,7 +35,7 @@ GF_OP_CMD_NONE = 0, GF_OP_CMD_START, GF_OP_CMD_COMMIT, - GF_OP_CMD_ABORT, + GF_OP_CMD_STOP, 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 24ddc02ac..975404907 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -1256,7 +1256,8 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr) break; } - case GF_OP_CMD_ABORT: + case GF_OP_CMD_STOP: + ret = 0; break; case GF_OP_CMD_COMMIT: @@ -1459,9 +1460,6 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr) int32_t replica_count = 0; glusterd_brickinfo_t *brickinfo = NULL; glusterd_brickinfo_t *tmp = NULL; - glusterd_conf_t *priv = NULL; - char pidfile[PATH_MAX]; - ret = dict_get_str (dict, "volname", &volname); @@ -1492,19 +1490,8 @@ glusterd_op_remove_brick (dict_t *dict, char **op_errstr) ret = 0; goto out; - case GF_OP_CMD_ABORT: + case GF_OP_CMD_STOP: { - if (volinfo->decommission_in_progress) { - priv = THIS->private; - if (!priv) - return ret; - - GLUSTERD_GET_DEFRAG_PID_FILE(pidfile, volinfo, priv); - - glusterd_service_stop ("rebalance", pidfile, SIGTERM, 1); - - } - /* Fall back to the old volume file */ list_for_each_entry_safe (brickinfo, tmp, &volinfo->bricks, brick_list) { diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c index e8e75c240..e3c4c4741 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c +++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c @@ -41,6 +41,7 @@ #include "glusterd-utils.h" #include "glusterd-store.h" #include "run.h" +#include "glusterd-volgen.h" #include "syscall.h" #include "cli1-xdr.h" @@ -596,6 +597,9 @@ glusterd_op_rebalance (dict_t *dict, char **op_errstr, dict_t *rsp_dict) char msg[2048] = {0}; glusterd_volinfo_t *volinfo = NULL; glusterd_conf_t *priv = NULL; + glusterd_brickinfo_t *brickinfo = NULL; + glusterd_brickinfo_t *tmp = NULL; + gf_boolean_t volfile_update = _gf_false; priv = THIS->private; @@ -626,6 +630,38 @@ glusterd_op_rebalance (dict_t *dict, char **op_errstr, dict_t *rsp_dict) cmd, NULL); break; case GF_DEFRAG_CMD_STOP: + /* Fall back to the old volume file in case of decommission*/ + list_for_each_entry_safe (brickinfo, tmp, &volinfo->bricks, + brick_list) { + if (!brickinfo->decommissioned) + continue; + brickinfo->decommissioned = 0; + volfile_update = _gf_true; + } + + if (volfile_update == _gf_false) { + ret = 0; + break; + } + + ret = glusterd_create_volfiles_and_notify_services (volinfo); + if (ret) { + gf_log (THIS->name, GF_LOG_WARNING, + "failed to create volfiles"); + goto out; + } + + ret = glusterd_store_volinfo (volinfo, + GLUSTERD_VOLINFO_VER_AC_INCREMENT); + if (ret) { + gf_log (THIS->name, GF_LOG_WARNING, + "failed to store volinfo"); + goto out; + } + + ret = 0; + break; + case GF_DEFRAG_CMD_STATUS: break; default: -- cgit