diff options
| -rw-r--r-- | cli/src/cli3_1-cops.c | 30 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 504 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.h | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 91 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.h | 8 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd3_1-mops.c | 7 |
8 files changed, 395 insertions, 253 deletions
diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c index b2a1a78b34e..d92da29138e 100644 --- a/cli/src/cli3_1-cops.c +++ b/cli/src/cli3_1-cops.c @@ -822,7 +822,6 @@ gf_cli3_1_replace_brick_cbk (struct rpc_req *req, struct iovec *iov, char *status_reply = NULL; gf1_cli_replace_op replace_op = 0; char *rb_operation_str = NULL; - char cmd_str[8192] = {0,}; if (-1 == req->rpc_status) { goto out; @@ -894,35 +893,6 @@ gf_cli3_1_replace_brick_cbk (struct rpc_req *req, struct iovec *iov, goto out; } - snprintf (cmd_str, 4096, "gluster volume replace-brick %s %s %s abort >/dev/null", - local->u.replace_brick.volname, src_brick, dst_brick); - - ret = system (cmd_str); - if (ret) { - gf_log ("", GF_LOG_DEBUG, - "add brick failed"); - goto out; - } - - snprintf (cmd_str, 4096, "gluster volume add-brick %s %s >/dev/null", - local->u.replace_brick.volname, dst_brick); - - ret = system (cmd_str); - if (ret) { - gf_log ("", GF_LOG_DEBUG, - "add brick failed"); - goto out; - } - - snprintf (cmd_str, 4096, "gluster --mode=script volume remove-brick %s %s >/dev/null", - local->u.replace_brick.volname, src_brick); - - ret = system (cmd_str); - if (ret) { - gf_log ("", GF_LOG_DEBUG, - "remove brick failed"); - goto out; - } if (rsp.op_ret || ret) rb_operation_str = "replace-brick commit failed"; diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 4c0d147e8df..341d2267a8d 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -343,8 +343,10 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count, ret = 0; size = rsp.op_ret; - if (size == oldvollen && (memcmp (oldvolfile, rsp.spec, size) == 0)) + if (size == oldvollen && (memcmp (oldvolfile, rsp.spec, size) == 0)) { + gf_log ("", GF_LOG_NORMAL, "No change in volfile, continuing"); goto out; + } tmpfp = tmpfile (); if (!tmpfp) { diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 55c01e975dc..af4b3130648 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -1731,7 +1731,6 @@ glusterd_handle_replace_brick (rpcsvc_request_t *req) " dst_brick:%s op:%s",cli_req.volname, src_brick, dst_brick ,operation); - ret = glusterd_replace_brick (req, dict); gf_cmd_log ("Volume replace-brick","on volname: %s %s", cli_req.volname, diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 91f833cd9a9..9c337328235 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -51,6 +51,7 @@ #include <signal.h> static struct list_head gd_op_sm_queue; +pthread_mutex_t gd_op_sm_lock; glusterd_op_info_t opinfo = {{0},}; static int glusterfs_port = GLUSTERD_DEFAULT_PORT; @@ -1128,19 +1129,159 @@ gf_boolean_t glusterd_check_option_exists(char *optstring) { //struct set_option_list *list; - char **list = NULL; - + char **list = NULL; - for (list = &set_option_list[0]; *list ;list++) + for (list = &set_option_list[0]; *list ;list++) if (!strcmp (optstring, *list)) return _gf_true; - - return _gf_false; } static int +glusterd_op_perform_remove_brick (glusterd_volinfo_t *volinfo, char *brick) +{ + + glusterd_brickinfo_t *brickinfo = NULL; + char *dup_brick = NULL; + glusterd_conf_t *priv = NULL; + int32_t ret = -1; + + GF_ASSERT (volinfo); + GF_ASSERT (brick); + + priv = THIS->private; + + dup_brick = gf_strdup (brick); + if (!dup_brick) + goto out; + + ret = glusterd_brickinfo_get (dup_brick, volinfo, &brickinfo); + if (ret) + goto out; + + ret = glusterd_resolve_brick (brickinfo); + if (ret) + goto out; + + if ((!uuid_compare (brickinfo->uuid, priv->uuid)) && + (GLUSTERD_STATUS_STARTED == volinfo->status)) { + gf_log ("", GF_LOG_NORMAL, "About to stop glusterfs" + " for brick %s:%s", brickinfo->hostname, + brickinfo->path); + ret = glusterd_volume_stop_glusterfs + (volinfo, brickinfo, 0); + if (ret) { + gf_log ("", GF_LOG_ERROR, "Unable to stop " + "glusterfs, ret: %d", ret); + goto out; + } + } + + glusterd_delete_volfile (volinfo, brickinfo); + glusterd_store_delete_brick (volinfo, brickinfo); + glusterd_brickinfo_delete (brickinfo); + volinfo->brick_count--; + +out: + gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); + return ret; +} + +static int +glusterd_op_perform_add_bricks (glusterd_volinfo_t *volinfo, int32_t count, + char *bricks) +{ + glusterd_brickinfo_t *brickinfo = NULL; + char *brick = NULL; + int32_t i = 1; + char *brick_list = NULL; + char *free_ptr1 = NULL; + char *free_ptr2 = NULL; + char *saveptr = NULL; + gf_boolean_t glfs_started = _gf_false; + int32_t ret = -1; + glusterd_conf_t *priv = NULL; + + priv = THIS->private; + + GF_ASSERT (volinfo); + + if (bricks) { + brick_list = gf_strdup (bricks); + free_ptr1 = brick_list; + } + + if (count) + brick = strtok_r (brick_list+1, " \n", &saveptr); + + while ( i <= count) { + ret = glusterd_brickinfo_from_brick (brick, &brickinfo); + if (ret) + goto out; + + list_add_tail (&brickinfo->brick_list, &volinfo->bricks); + brick = strtok_r (NULL, " \n", &saveptr); + i++; + } + + brick_list = gf_strdup (bricks); + free_ptr2 = brick_list; + i = 1; + + if (count) + brick = strtok_r (brick_list+1, " \n", &saveptr); + + while (i <= count) { + + ret = glusterd_brickinfo_get (brick, volinfo, &brickinfo); + if (ret) + goto out; + + ret = glusterd_resolve_brick (brickinfo); + + if (!ret && (!uuid_compare (brickinfo->uuid, priv->uuid)) && + (GLUSTERD_STATUS_STARTED == volinfo->status)) { + ret = glusterd_create_volfiles (volinfo); + if (ret) + goto out; + + gf_log ("", GF_LOG_NORMAL, "About to start glusterfs" + " for brick %s:%s", brickinfo->hostname, + brickinfo->path); + ret = glusterd_volume_start_glusterfs + (volinfo, brickinfo, 0); + if (ret) { + gf_log ("", GF_LOG_ERROR, "Unable to start " + "glusterfs, ret: %d", ret); + goto out; + } + glfs_started = _gf_true; + } + i++; + brick = strtok_r (NULL, " \n", &saveptr); + } + + if (!glfs_started) { + ret = glusterd_create_volfiles (volinfo); + if (ret) + goto out; + } + + volinfo->brick_count += count; + +out: + if (free_ptr1) + GF_FREE (free_ptr1); + if (free_ptr2) + GF_FREE (free_ptr2); + + gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); + return ret; +} + + +static int glusterd_op_stage_remove_brick (gd1_mgmt_stage_op_req *req) { int ret = -1; @@ -1454,18 +1595,9 @@ glusterd_op_add_brick (gd1_mgmt_stage_op_req *req, char **op_errstr) char *volname = NULL; glusterd_conf_t *priv = NULL; glusterd_volinfo_t *volinfo = NULL; - glusterd_brickinfo_t *brickinfo = NULL; xlator_t *this = NULL; - char *brick = NULL; + char *bricks = NULL; int32_t count = 0; - int32_t i = 1; - char *bricks = NULL; - char *brick_list = NULL; - char *free_ptr1 = NULL; - char *free_ptr2 = NULL; - char *saveptr = NULL; - gf_boolean_t glfs_started = _gf_false; - int32_t mybrick = 0; GF_ASSERT (req); @@ -1500,14 +1632,12 @@ glusterd_op_add_brick (gd1_mgmt_stage_op_req *req, char **op_errstr) goto out; } - ret = dict_get_int32 (dict, "count", &count); if (ret) { gf_log ("", GF_LOG_ERROR, "Unable to get count"); goto out; } - volinfo->brick_count += count; ret = dict_get_str (dict, "bricks", &bricks); if (ret) { @@ -1515,73 +1645,16 @@ glusterd_op_add_brick (gd1_mgmt_stage_op_req *req, char **op_errstr) goto out; } - if (bricks) { - brick_list = gf_strdup (bricks); - free_ptr1 = brick_list; - } - - if (count) - brick = strtok_r (brick_list+1, " \n", &saveptr); - - while ( i <= count) { - ret = glusterd_brickinfo_from_brick (brick, &brickinfo); - if (ret) - goto out; - - list_add_tail (&brickinfo->brick_list, &volinfo->bricks); - brick = strtok_r (NULL, " \n", &saveptr); - i++; - } - - brick_list = gf_strdup (bricks); - free_ptr2 = brick_list; - i = 1; - - if (count) - brick = strtok_r (brick_list+1, " \n", &saveptr); - - while (i <= count) { - - ret = glusterd_brickinfo_get (brick, volinfo, &brickinfo); - if (ret) - goto out; - - ret = glusterd_resolve_brick (brickinfo); - - if (!ret && (!uuid_compare (brickinfo->uuid, priv->uuid)) && - (GLUSTERD_STATUS_STARTED == volinfo->status)) { - ret = glusterd_create_volfiles (volinfo); - if (ret) - goto out; - - gf_log ("", GF_LOG_NORMAL, "About to start glusterfs" - " for brick %s:%s", brickinfo->hostname, - brickinfo->path); - ret = glusterd_volume_start_glusterfs - (volinfo, brickinfo, mybrick); - if (ret) { - gf_log ("", GF_LOG_ERROR, "Unable to start " - "glusterfs, ret: %d", ret); - goto out; - } - glfs_started = _gf_true; - mybrick++; - } - i++; - brick = strtok_r (NULL, " \n", &saveptr); - } - - if (!glfs_started) { - ret = glusterd_create_volfiles (volinfo); - if (ret) - goto out; + ret = glusterd_op_perform_add_bricks (volinfo, count, bricks); + if (ret) { + gf_log ("", GF_LOG_ERROR, "Unable to add bricks"); + goto out; } volinfo->version++; volinfo->defrag_status = 0; ret = glusterd_store_update_volume (volinfo); - if (ret) goto out; @@ -1595,15 +1668,13 @@ glusterd_op_add_brick (gd1_mgmt_stage_op_req *req, char **op_errstr) out: if (dict) dict_unref (dict); - if (free_ptr1) - GF_FREE (free_ptr1); - if (free_ptr2) - GF_FREE (free_ptr2); return ret; } static int -rb_regenerate_volfiles (glusterd_volinfo_t *volinfo, int32_t pump_needed) +rb_regenerate_volfiles (glusterd_volinfo_t *volinfo, + glusterd_brickinfo_t *brickinfo, + int32_t pump_needed) { dict_t *dict = NULL; int ret = 0; @@ -1620,7 +1691,7 @@ rb_regenerate_volfiles (glusterd_volinfo_t *volinfo, int32_t pump_needed) goto out; } - ret = glusterd_create_volfiles (volinfo); + ret = glusterd_rb_create_volfiles (volinfo, brickinfo); out: return ret; @@ -1647,14 +1718,14 @@ rb_src_brick_restart (glusterd_volinfo_t *volinfo, glusterd_delete_volfile (volinfo, src_brickinfo); if (activate_pump) { - ret = rb_regenerate_volfiles (volinfo, 1); + ret = rb_regenerate_volfiles (volinfo, src_brickinfo, 1); if (ret) { gf_log ("", GF_LOG_DEBUG, "Could not regenerate volfiles with pump"); goto out; } } else { - ret = rb_regenerate_volfiles (volinfo, 0); + ret = rb_regenerate_volfiles (volinfo, src_brickinfo, 0); if (ret) { gf_log ("", GF_LOG_DEBUG, "Could not regenerate volfiles without pump"); @@ -1663,6 +1734,7 @@ rb_src_brick_restart (glusterd_volinfo_t *volinfo, } + sleep (2); ret = glusterd_volume_start_glusterfs (volinfo, src_brickinfo, 0); if (ret) { @@ -2246,32 +2318,6 @@ out: return ret; } -static int -rb_do_operation_commit (glusterd_volinfo_t *volinfo, - glusterd_brickinfo_t *src_brickinfo, - glusterd_brickinfo_t *dst_brickinfo) -{ - int ret = 0; - - ret = rb_src_brick_restart (volinfo, src_brickinfo, - 0); - if (ret) { - gf_log ("", GF_LOG_DEBUG, - "Could not restart src-brick"); - goto out; - } - - gf_log ("", GF_LOG_DEBUG, - "received commit on %s:%s to %s:%s " - "on volume %s", - src_brickinfo->hostname, - src_brickinfo->path, - dst_brickinfo->hostname, - dst_brickinfo->path, - volinfo->volname); -out: - return ret; -} static int rb_get_xattr_command (glusterd_volinfo_t *volinfo, @@ -2320,14 +2366,22 @@ rb_do_operation_status (glusterd_volinfo_t *volinfo, glusterd_brickinfo_t *src_brickinfo, glusterd_brickinfo_t *dst_brickinfo) { - char status[2048] = {0,}; - char *status_reply = NULL; - dict_t *ctx = NULL; - int ret = -1; + char status[2048] = {0,}; + char *status_reply = NULL; + dict_t *ctx = NULL; + int ret = 0; + gf_boolean_t origin = _gf_false; - if (!glusterd_is_local_addr (src_brickinfo->hostname)) { - gf_log ("", GF_LOG_NORMAL, - "I AM THE SOURCE HOST"); + ctx = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK); + if (!ctx) { + gf_log ("", GF_LOG_ERROR, + "Operation Context is not present"); + goto out; + } + + origin = _gf_true; + + if (origin) { ret = rb_spawn_maintainence_client (volinfo, src_brickinfo); if (ret) { gf_log ("", GF_LOG_DEBUG, @@ -2351,13 +2405,6 @@ rb_do_operation_status (glusterd_volinfo_t *volinfo, gf_log ("", GF_LOG_DEBUG, "pump status is %s", status); - ctx = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK); - if (!ctx) { - gf_log ("", GF_LOG_ERROR, - "Operation Context is not present"); - ret = -1; - goto umount; - } status_reply = gf_strdup (status); if (!status_reply) { gf_log ("", GF_LOG_ERROR, "Out of memory"); @@ -2404,6 +2451,7 @@ glusterd_op_replace_brick (gd1_mgmt_stage_op_req *req, dict_t *rsp_dict) char *dst_brick = NULL; glusterd_brickinfo_t *src_brickinfo = NULL; glusterd_brickinfo_t *dst_brickinfo = NULL; + char dup_brick[4096] = {0,}; GF_ASSERT (req); @@ -2538,8 +2586,74 @@ glusterd_op_replace_brick (gd1_mgmt_stage_op_req *req, dict_t *rsp_dict) case GF_REPLACE_OP_COMMIT: { + + ret = dict_set_int32 (volinfo->dict, "enable-pump", 0); gf_log ("", GF_LOG_DEBUG, - "Received commit - doing nothing"); + "Received commit - will be adding dst brick and " + "removing src brick"); + + if (!glusterd_is_local_addr (dst_brickinfo->hostname)) { + gf_log ("", GF_LOG_NORMAL, + "I AM THE DESTINATION HOST"); + ret = rb_kill_destination_brick (volinfo, dst_brickinfo); + if (ret) { + gf_log ("", GF_LOG_DEBUG, + "Failed to kill destination brick"); + goto out; + } + } + + if (ret) { + gf_log ("", GF_LOG_CRITICAL, "Unable to cleanup " + "dst brick"); + goto out; + } + + snprintf (dup_brick, sizeof (dup_brick), " %s", dst_brick); + ret = glusterd_op_perform_add_bricks (volinfo, 1, + dup_brick); + if (ret) { + gf_log ("", GF_LOG_CRITICAL, "Unable to add " + "dst-brick: %s to volume: %s", + dst_brick, volinfo->volname); + goto out; + } + + ret = glusterd_op_perform_remove_brick (volinfo, src_brick); + if (ret) { + gf_log ("", GF_LOG_CRITICAL, "Unable to add " + "src-brick: %s to volume: %s", + src_brick, volinfo->volname); + goto out; + } + + ret = glusterd_create_volfiles (volinfo); + if (ret) { + gf_log ("", GF_LOG_DEBUG, + "Could not generate volfile for client"); + goto out; + } + volinfo->version++; + volinfo->defrag_status = 0; + + ret = glusterd_store_update_volume (volinfo); + + if (ret) + goto out; + + ret = glusterd_volume_compute_cksum (volinfo); + if (ret) + goto out; + + ret = glusterd_check_generate_start_nfs (volinfo); + + if (ret) { + gf_log ("", GF_LOG_CRITICAL, "Failed to generate " + " nfs volume file"); + } + + ret = glusterd_fetchspec_notify (THIS); + } break; @@ -2570,6 +2684,8 @@ glusterd_op_replace_brick (gd1_mgmt_stage_op_req *req, dict_t *rsp_dict) { gf_log ("", GF_LOG_DEBUG, "received status - doing nothing"); + ret = rb_do_operation_status (volinfo, src_brickinfo, + dst_brickinfo); } break; @@ -2702,15 +2818,11 @@ glusterd_op_remove_brick (gd1_mgmt_stage_op_req *req) char *volname = NULL; glusterd_conf_t *priv = NULL; glusterd_volinfo_t *volinfo = NULL; - glusterd_brickinfo_t *brickinfo = NULL; xlator_t *this = NULL; char *brick = NULL; int32_t count = 0; int32_t i = 1; - gf_boolean_t glfs_stopped = _gf_false; - int32_t mybrick = 0; char key[256] = {0,}; - char *dup_brick = NULL; GF_ASSERT (req); @@ -2760,43 +2872,14 @@ glusterd_op_remove_brick (gd1_mgmt_stage_op_req *req) gf_log ("", GF_LOG_ERROR, "Unable to get %s", key); goto out; } - if (dup_brick) - GF_FREE (dup_brick); - dup_brick = gf_strdup (brick); - if (!dup_brick) - goto out; - - ret = glusterd_brickinfo_get (dup_brick, volinfo, &brickinfo); - if (ret) - goto out; - - ret = glusterd_resolve_brick (brickinfo); - - if (ret) + ret = glusterd_op_perform_remove_brick (volinfo, brick); + if (ret) { + gf_log ("", GF_LOG_CRITICAL, "Unable to remove" + " brick: %s", brick); goto out; - - if ((!uuid_compare (brickinfo->uuid, priv->uuid)) && - (GLUSTERD_STATUS_STARTED == volinfo->status)) { - gf_log ("", GF_LOG_NORMAL, "About to stop glusterfs" - " for brick %s:%s", brickinfo->hostname, - brickinfo->path); - ret = glusterd_volume_stop_glusterfs - (volinfo, brickinfo, mybrick); - if (ret) { - gf_log ("", GF_LOG_ERROR, "Unable to stop " - "glusterfs, ret: %d", ret); - goto out; - } - glfs_stopped = _gf_true; - mybrick++; } - glusterd_delete_volfile (volinfo, brickinfo); - glusterd_store_delete_brick (volinfo, brickinfo); - glusterd_brickinfo_delete (brickinfo); - volinfo->brick_count--; - i++; } @@ -2822,8 +2905,6 @@ glusterd_op_remove_brick (gd1_mgmt_stage_op_req *req) out: if (dict) dict_unref (dict); - if (dup_brick) - GF_FREE (dup_brick); return ret; } @@ -3478,6 +3559,43 @@ out: } +static int32_t +glusterd_op_start_rb_timer (dict_t *dict) +{ + int32_t op = 0; + struct timeval timeout = {0, }; + glusterd_conf_t *priv = NULL; + int32_t ret = -1; + + GF_ASSERT (dict); + priv = THIS->private; + + ret = dict_get_int32 (dict, "operation", &op); + if (ret) { + gf_log ("", GF_LOG_DEBUG, + "dict_get on operation failed"); + goto out; + } + + if (op == GF_REPLACE_OP_START || + op == GF_REPLACE_OP_ABORT) + timeout.tv_sec = 5; + else + timeout.tv_sec = 1; + + timeout.tv_usec = 0; + + + priv->timer = gf_timer_call_after (THIS->ctx, timeout, + glusterd_do_replace_brick, + (void *) dict); + + ret = 0; + +out: + return ret; +} + static int glusterd_op_ac_send_commit_op (glusterd_op_sm_event_t *event, void *ctx) { @@ -3485,6 +3603,7 @@ glusterd_op_ac_send_commit_op (glusterd_op_sm_event_t *event, void *ctx) rpc_clnt_procedure_t *proc = NULL; glusterd_conf_t *priv = NULL; xlator_t *this = NULL; + dict_t *dict = NULL; this = THIS; GF_ASSERT (this); @@ -3496,12 +3615,21 @@ glusterd_op_ac_send_commit_op (glusterd_op_sm_event_t *event, void *ctx) GF_ASSERT (proc); if (proc->fn) { ret = proc->fn (NULL, this, NULL); - if (!ret) + if (ret) goto out; } - if (!opinfo.pending_count) - ret = glusterd_op_sm_inject_all_acc (); + if (!opinfo.pending_count) { + dict = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK); + if (dict) { + dict = dict_ref (dict); + ret = glusterd_op_start_rb_timer (dict); + if (ret) + goto out; + } else { + ret = glusterd_op_sm_inject_all_acc (); + } + } out: gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); @@ -3648,17 +3776,14 @@ glusterd_do_replace_brick (void *data) case GF_REPLACE_OP_START: ret = rb_do_operation_start (volinfo, src_brickinfo, dst_brickinfo); break; - case GF_REPLACE_OP_COMMIT: - ret = rb_do_operation_commit (volinfo, src_brickinfo, dst_brickinfo); - break; case GF_REPLACE_OP_PAUSE: ret = rb_do_operation_pause (volinfo, src_brickinfo, dst_brickinfo); break; case GF_REPLACE_OP_ABORT: ret = rb_do_operation_abort (volinfo, src_brickinfo, dst_brickinfo); break; + case GF_REPLACE_OP_COMMIT: case GF_REPLACE_OP_STATUS: - ret = rb_do_operation_status (volinfo, src_brickinfo, dst_brickinfo); break; default: ret = -1; @@ -3674,6 +3799,8 @@ out: glusterd_op_sm (); } + + static int glusterd_op_ac_rcvd_commit_op_acc (glusterd_op_sm_event_t *event, void *ctx) { @@ -3681,8 +3808,6 @@ glusterd_op_ac_rcvd_commit_op_acc (glusterd_op_sm_event_t *event, void *ctx) dict_t *dict = NULL; int ret = 0; gf_boolean_t commit_ack_inject = _gf_false; - int32_t op = 0; - struct timeval timeout = {0, }; priv = THIS->private; GF_ASSERT (event); @@ -3694,26 +3819,9 @@ glusterd_op_ac_rcvd_commit_op_acc (glusterd_op_sm_event_t *event, void *ctx) dict = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK); if (dict) { - if (op == GF_REPLACE_OP_START || - op == GF_REPLACE_OP_ABORT) - timeout.tv_sec = 5; - else - timeout.tv_sec = 1; - - timeout.tv_usec = 0; - - ret = dict_get_int32 (dict, "operation", &op); - if (ret) { - gf_log ("", GF_LOG_DEBUG, - "dict_get on operation failed"); + ret = glusterd_op_start_rb_timer (dict); + if (ret) goto out; - } - - priv->timer = gf_timer_call_after (THIS->ctx, timeout, - glusterd_do_replace_brick, - (void *) dict); - - ret = 0; commit_ack_inject = _gf_false; goto out; } @@ -4437,7 +4545,7 @@ glusterd_op_sm_inject_event (glusterd_op_sm_event_type_t event_type, event->ctx = ctx; gf_log ("glusterd", GF_LOG_NORMAL, "Enqueuing event: %d", - event->event); + event->event); list_add_tail (&event->list, &gd_op_sm_queue); out: @@ -4476,6 +4584,7 @@ glusterd_op_sm () glusterd_op_sm_t *state = NULL; glusterd_op_sm_event_type_t event_type = GD_OP_EVENT_NONE; + (void ) pthread_mutex_lock (&gd_op_sm_lock); while (!list_empty (&gd_op_sm_queue)) { @@ -4483,6 +4592,8 @@ glusterd_op_sm () list_del_init (&event->list); event_type = event->event; + gf_log ("", GF_LOG_DEBUG, "Dequeued event of type: %d", + event_type); state = glusterd_op_state_table[opinfo.state.state]; @@ -4510,6 +4621,7 @@ glusterd_op_sm () "state from %d to %d", opinfo.state.state, state[event_type].next_state); + (void ) pthread_mutex_unlock (&gd_op_sm_lock); return ret; } @@ -4519,6 +4631,7 @@ glusterd_op_sm () } + (void ) pthread_mutex_unlock (&gd_op_sm_lock); ret = 0; return ret; @@ -4721,6 +4834,7 @@ int glusterd_op_sm_init () { INIT_LIST_HEAD (&gd_op_sm_queue); + pthread_mutex_init (&gd_op_sm_lock, NULL); return 0; } diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h index 2f39d24f709..c0b3249e9b5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h @@ -244,4 +244,7 @@ glusterd_check_option_exists(char *optstring); int set_xlator_option (dict_t *dict, char *key, char *value); + +void +glusterd_do_replace_brick (void *data); #endif diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 75f728c6343..782170c9a3a 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -2255,38 +2255,24 @@ out: static int generate_brick_volfiles (glusterd_volinfo_t *volinfo) { - glusterd_brickinfo_t *brickinfo = NULL; - char *filename = NULL; - int ret = -1; + glusterd_brickinfo_t *brickinfo = NULL; + int ret = -1; list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { gf_log ("", GF_LOG_DEBUG, "Found a brick - %s:%s", brickinfo->hostname, brickinfo->path); - filename = get_brick_filename (volinfo, brickinfo); - if (!filename) { - gf_log ("", GF_LOG_ERROR, - "Out of memory"); - ret = -1; - goto out; - } - - ret = generate_server_volfile (brickinfo, volinfo->dict, - filename); - if (ret) { - gf_log ("", GF_LOG_DEBUG, - "Could not generate volfile for brick %s:%s", - brickinfo->hostname, brickinfo->path); + ret = glusterd_generate_brick_volfile (volinfo, brickinfo); + if (ret) goto out; - } - if (filename) - GF_FREE (filename); } ret = 0; + out: + gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); return ret; } @@ -2539,6 +2525,34 @@ glusterd_volgen_set_transport (glusterd_volinfo_t *volinfo) } int +glusterd_rb_create_volfiles (glusterd_volinfo_t *volinfo, + glusterd_brickinfo_t *brickinfo) +{ + int ret = -1; + + glusterd_volgen_set_transport (volinfo); + + ret = glusterd_generate_brick_volfile (volinfo, brickinfo); + if (ret) { + gf_log ("", GF_LOG_DEBUG, + "Could not generate volfiles for bricks"); + goto out; + } + + ret = generate_client_volfiles (volinfo); + if (ret) { + gf_log ("", GF_LOG_DEBUG, + "Could not generate volfile for client"); + goto out; + } + + ret = glusterd_fetchspec_notify (THIS); + +out: + return ret; +} + +int glusterd_create_volfiles (glusterd_volinfo_t *volinfo) { int ret = -1; @@ -2583,3 +2597,40 @@ glusterd_delete_volfile (glusterd_volinfo_t *volinfo, GF_FREE (filename); return 0; } + +int +glusterd_generate_brick_volfile (glusterd_volinfo_t *volinfo, + glusterd_brickinfo_t *brickinfo) +{ + char *filename = NULL; + int ret = -1; + + GF_ASSERT (volinfo); + GF_ASSERT (brickinfo); + + filename = get_brick_filename (volinfo, brickinfo); + + if (!filename) { + gf_log ("", GF_LOG_ERROR, + "Out of memory"); + ret = -1; + goto out; + } + + ret = generate_server_volfile (brickinfo, volinfo->dict, + filename); + if (ret) { + gf_log ("", GF_LOG_DEBUG, + "Could not generate volfile for brick %s:%s", + brickinfo->hostname, brickinfo->path); + goto out; + } + + ret = 0; + +out: + if (filename) + GF_FREE (filename); + + return ret; +} diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.h b/xlators/mgmt/glusterd/src/glusterd-volgen.h index 2f0ab8bdbd0..8173631a426 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.h +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.h @@ -146,4 +146,12 @@ volgen_generate_nfs_volfile (glusterd_volinfo_t *volinfo); int uncomment_option( char *opt_str,char *comment_str); + +int +glusterd_generate_brick_volfile (glusterd_volinfo_t *volinfo, + glusterd_brickinfo_t *brickinfo); + +int +glusterd_rb_create_volfiles (glusterd_volinfo_t *volinfo, + glusterd_brickinfo_t *brickinfo); #endif diff --git a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c index f4b90f6caff..a92fab4594a 100644 --- a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c +++ b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c @@ -1190,12 +1190,7 @@ glusterd3_1_commit_op (call_frame_t *frame, xlator_t *this, } if (GD_OP_MAX == i) { - - //No pending ops, inject stage_acc - - ret = glusterd_op_sm_inject_event - (GD_OP_EVENT_COMMIT_ACC, NULL); - + //No pending ops, return return ret; } |