diff options
| author | Krishnan Parthasarathi <kp@gluster.com> | 2011-07-06 14:10:25 +0530 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-07-27 01:26:25 -0700 |
| commit | a6c8444a2e9730d6f06263dc38025a962d6d486e (patch) | |
| tree | ce3c8cfcab102a1eea78018666d4d59080f756a7 /xlators/mgmt/glusterd/src/glusterd-op-sm.c | |
| parent | 235f28b518252a4b9ebd89db505b472b9f7d664d (diff) | |
glusterd: handle replace-brick in paused state.
This change ensures that glusterd retains 'state' information
of an ongoing replace brick operation even if it went down midway.
Change-Id: Ibb161b874468a27cbf35a7ef49e9da5495c4025e
BUG: 3252
Reviewed-on: http://review.gluster.com/107
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 8c87dcc2536..e9cc4686f38 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -3833,11 +3833,6 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict) "Failed to generate nfs volume file"); } - ret = glusterd_store_volinfo (volinfo, - GLUSTERD_VOLINFO_VER_AC_INCREMENT); - - if (ret) - goto out; ret = glusterd_fetchspec_notify (THIS); glusterd_set_rb_status (volinfo, GF_RB_STATUS_NONE); @@ -3905,6 +3900,16 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict) "received status - doing nothing"); ctx = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK); if (ctx) { + if (glusterd_is_rb_paused (volinfo)) { + ret = dict_set_str (ctx, "status-reply", + "replace brick has been paused"); + if (ret) + gf_log (THIS->name, GF_LOG_ERROR, + "failed to set pump status" + "in ctx"); + goto out; + } + ret = rb_do_operation_status (volinfo, src_brickinfo, dst_brickinfo); if (ret) @@ -3918,9 +3923,12 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict) ret = -1; goto out; } - + if (!ret && replace_op != GF_REPLACE_OP_STATUS) + ret = glusterd_store_volinfo (volinfo, + GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) - goto out; + gf_log (THIS->name, GF_LOG_ERROR, "Couldn't store" + " replace brick operation's state"); out: return ret; |