diff options
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 5bfdb0bb43e..c91fdbcea4f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -77,6 +77,11 @@ static struct cds_list_head gd_op_sm_queue; synclock_t gd_op_sm_lock; glusterd_op_info_t opinfo = {{0},}; +int +glusterd_bricks_select_rebalance_volume (dict_t *dict, char **op_errstr, + struct cds_list_head *selected); + + int32_t glusterd_txn_opinfo_dict_init () { @@ -5161,10 +5166,10 @@ glusterd_bricks_select_remove_brick (dict_t *dict, char **op_errstr, int32_t i = 1; char key[256] = {0,}; glusterd_pending_node_t *pending_node = NULL; + int32_t command = 0; int32_t force = 0; - ret = dict_get_str (dict, "volname", &volname); if (ret) { @@ -5185,6 +5190,15 @@ glusterd_bricks_select_remove_brick (dict_t *dict, char **op_errstr, goto out; } + ret = dict_get_int32 (dict, "command", &command); + if (ret) { + gf_log ("", GF_LOG_ERROR, "Unable to get command"); + goto out; + } + + if (command == GF_OP_CMD_DETACH_START) + return glusterd_bricks_select_rebalance_volume(dict, op_errstr, selected); + ret = dict_get_int32 (dict, "force", &force); if (ret) { gf_log (THIS->name, GF_LOG_INFO, "force flag is not set"); @@ -5863,7 +5877,7 @@ out: } -static int +int glusterd_bricks_select_rebalance_volume (dict_t *dict, char **op_errstr, struct cds_list_head *selected) { @@ -5900,7 +5914,7 @@ glusterd_bricks_select_rebalance_volume (dict_t *dict, char **op_errstr, } else { pending_node->node = volinfo; pending_node->type = GD_NODE_REBALANCE; - cds_list_add_tail (&pending_node->list, &opinfo.pending_bricks); + cds_list_add_tail (&pending_node->list, selected); pending_node = NULL; } |