summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2010-09-23 09:18:37 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-23 07:58:16 -0700
commitc5a5fea9e6a1f1709e6826c1eea89dfd25cc496b (patch)
tree0f8abfa9c32e17c08fd33666183f0cc54118570f
parentfa3ca3c61fbd7ad95f57f0522624396b8f05ecf6 (diff)
mgmt/glusterd: Misc fixes to pump / cli / glusterd wrt replace brick.v3.1.0qa30v3.1.0beta
Patches from Vijay and Shishir have been pulled in into this one big patch. Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1235 (Bug for all pump/migrate commits) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1235
-rw-r--r--cli/src/cli-cmd-volume.c2
-rw-r--r--cli/src/cli3_1-cops.c2
-rw-r--r--glusterfsd/src/glusterfsd-mgmt.c2
-rw-r--r--glusterfsd/src/glusterfsd.c3
-rw-r--r--xlators/cluster/afr/src/afr-common.c2
-rw-r--r--xlators/cluster/afr/src/pump.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c48
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c370
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-pmap.c14
-rw-r--r--xlators/mgmt/glusterd/src/glusterd.h2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd3_1-mops.c1
-rw-r--r--xlators/protocol/client/src/client.c4
12 files changed, 262 insertions, 190 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index 432a056..c7a027a 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -611,7 +611,7 @@ void
cli_cmd_volume_replace_brick_usage ()
{
cli_out("Usage: volume replace-brick <VOLNAME> "
- "<BRICK> <NEW-BRICK> start|pause|abort|status");
+ "<BRICK> <NEW-BRICK> start|pause|abort|commit|status");
}
diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c
index 78683cc..b2a1a78 100644
--- a/cli/src/cli3_1-cops.c
+++ b/cli/src/cli3_1-cops.c
@@ -914,7 +914,7 @@ gf_cli3_1_replace_brick_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
- snprintf (cmd_str, 4096, "gluster mode script volume remove-brick %s %s >/dev/null",
+ 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);
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index d9cc83a..7f1b52f 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -592,6 +592,7 @@ mgmt_pmap_signout_cbk (struct rpc_req *req, struct iovec *iov, int count,
pmap_signout_rsp rsp = {0,};
call_frame_t *frame = NULL;
int ret = 0;
+ glusterfs_ctx_t *ctx = NULL;
frame = myframe;
@@ -601,6 +602,7 @@ mgmt_pmap_signout_cbk (struct rpc_req *req, struct iovec *iov, int count,
goto out;
}
+ ctx = glusterfs_ctx_get ();
ret = xdr_to_pmap_signout_rsp (*iov, &rsp);
if (ret < 0) {
gf_log ("", GF_LOG_ERROR, "error");
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index e383f96..d73be8f 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -645,6 +645,7 @@ cleanup_and_exit (int signum)
/* TODO: is this the right place? */
glusterfs_mgmt_pmap_signout (ctx);
+
if (ctx && ctx->mgmt)
rpc_clnt_destroy (ctx->mgmt);
@@ -664,7 +665,9 @@ cleanup_and_exit (int signum)
while (trav) {
if (trav->fini) {
THIS = trav;
+ gf_log ("", GF_LOG_NORMAL, "Calling fini for %s", trav->name);
trav->fini (trav);
+ gf_log ("", GF_LOG_NORMAL, "Done Calling fini for %s", trav->name);
}
trav = trav->next;
}
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 9135e84..0abfb1e 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -823,7 +823,7 @@ afr_fresh_lookup_cbk (call_frame_t *frame, void *cookie,
local->cont.lookup.postparent = *postparent;
if (priv->first_lookup && inode->ino == 1) {
- gf_log (this->name, GF_LOG_TRACE,
+ gf_log (this->name, GF_LOG_NORMAL,
"added root inode");
priv->root_inode = inode_ref (inode);
priv->first_lookup = 0;
diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c
index 306e0e7..87e529b 100644
--- a/xlators/cluster/afr/src/pump.c
+++ b/xlators/cluster/afr/src/pump.c
@@ -2267,6 +2267,7 @@ init (xlator_t *this)
priv->data_change_log = 1;
priv->metadata_change_log = 1;
priv->entry_change_log = 1;
+ priv->use_afr_in_pump = 1;
/* Locking options */
@@ -2402,6 +2403,7 @@ struct xlator_fops fops = {
.fsyncdir = pump_fsyncdir,
.xattrop = pump_xattrop,
.fxattrop = pump_fxattrop,
+ .getxattr = pump_getxattr,
/* inode write */
.writev = pump_writev,
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 4d9a662..b35427c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -2256,44 +2256,6 @@ glusterd_op_stage_send_resp (rpcsvc_request_t *req,
return ret;
}
-static int
-glusterd_fill_rb_commit_rsp (dict_t *rsp_dict)
-{
- dict_t *dict = NULL;
- int32_t port_no = 0;
- int ret = 0;
-
- dict = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK);
- if (!dict) {
- gf_log ("", GF_LOG_ERROR,
- "Operation Context is not present");
- ret = 0;
- goto out;
- }
-
- ret = dict_get_int32 (dict, "src-brick-port", &port_no);
- if (ret) {
- gf_log ("", GF_LOG_DEBUG,
- "Could not get src-brick-port => this must "
- "be a non-source glusterd process");
- ret = 0;
- goto out;
- }
-
- gf_log ("", GF_LOG_DEBUG,
- "This is the source glusterd => fill the src port");
-
- ret = dict_set_int32 (rsp_dict, "src-brick-port", port_no);
- if (ret) {
- gf_log ("", GF_LOG_DEBUG,
- "Could not set commit rsp dict");
- goto out;
- }
-
-out:
- return ret;
-}
-
int
glusterd_op_commit_send_resp (rpcsvc_request_t *req,
int32_t op, int32_t status, char *op_errstr,
@@ -2312,16 +2274,6 @@ glusterd_op_commit_send_resp (rpcsvc_request_t *req,
else
rsp.op_errstr = "";
- switch (op) {
- case GD_OP_REPLACE_BRICK:
- ret = glusterd_fill_rb_commit_rsp (rsp_dict);
- if (ret)
- goto out;
- break;
- default:
- break;
- }
-
ret = dict_allocate_and_serialize (rsp_dict,
&rsp.dict.dict_val,
(size_t *)&rsp.dict.dict_len);
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index b8d2778..8176232 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -1643,7 +1643,6 @@ rb_src_brick_restart (glusterd_volinfo_t *volinfo,
}
glusterd_delete_volfile (volinfo, src_brickinfo);
- glusterd_store_delete_brick (volinfo, src_brickinfo);
if (activate_pump) {
ret = rb_regenerate_volfiles (volinfo, 1);
@@ -1694,12 +1693,12 @@ rb_send_xattr_command (glusterd_volinfo_t *volinfo,
RB_CLIENT_MOUNTPOINT);
ret = stat (mount_point_path, &buf);
- if (ret) {
- gf_log ("", GF_LOG_DEBUG,
- "stat failed. Could not send "
- " %s command", xattr_key);
- goto out;
- }
+ if (ret) {
+ gf_log ("", GF_LOG_DEBUG,
+ "stat failed. Could not send "
+ " %s command", xattr_key);
+ goto out;
+ }
ret = lsetxattr (mount_point_path, xattr_key,
value,
@@ -1789,13 +1788,13 @@ rb_spawn_glusterfs_client (glusterd_volinfo_t *volinfo,
ret = stat (cmd_str, &buf);
if (ret) {
- gf_log ("", GF_LOG_DEBUG,
- "stat on mountpoint failed");
- goto out;
- }
+ gf_log ("", GF_LOG_DEBUG,
+ "stat on mountpoint failed");
+ goto out;
+ }
- gf_log ("", GF_LOG_DEBUG,
- "stat on mountpoint succeeded");
+ gf_log ("", GF_LOG_DEBUG,
+ "stat on mountpoint succeeded");
ret = 0;
@@ -2083,13 +2082,6 @@ rb_do_operation_start (glusterd_volinfo_t *volinfo,
char start_value[8192] = {0,};
int ret = -1;
- ret = rb_src_brick_restart (volinfo, src_brickinfo,
- 1);
- if (ret) {
- gf_log ("", GF_LOG_DEBUG,
- "Could not restart src-brick");
- goto out;
- }
gf_log ("", GF_LOG_DEBUG,
"replace-brick sending start xattr");
@@ -2172,12 +2164,21 @@ rb_do_operation_pause (glusterd_volinfo_t *volinfo,
goto out;
}
+
gf_log ("", GF_LOG_DEBUG,
"unmounted the replace brick client");
ret = 0;
out:
+ if (!glusterd_is_local_addr (src_brickinfo->hostname)) {
+ ret = rb_src_brick_restart (volinfo, src_brickinfo,
+ 0);
+ if (ret) {
+ gf_log ("", GF_LOG_DEBUG,
+ "Could not restart src-brick");
+ }
+ }
return ret;
}
@@ -2194,7 +2195,7 @@ rb_kill_destination_brick (glusterd_volinfo_t *volinfo,
priv->workdir, volinfo->volname,
RB_DSTBRICK_PIDFILE);
- return glusterd_service_stop ("brick", pidfile, SIGQUIT, _gf_true);
+ return glusterd_service_stop ("brick", pidfile, SIGTERM, _gf_true);
}
static int
@@ -2204,14 +2205,6 @@ rb_do_operation_abort (glusterd_volinfo_t *volinfo,
{
int ret = -1;
- 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,
"replace-brick sending abort xattr");
@@ -2283,7 +2276,7 @@ rb_get_xattr_command (glusterd_volinfo_t *volinfo,
glusterd_brickinfo_t *src_brickinfo,
glusterd_brickinfo_t *dst_brickinfo,
const char *xattr_key,
- const char **value)
+ char *value)
{
glusterd_conf_t *priv = NULL;
char mount_point_path[PATH_MAX] = {0,};
@@ -2296,19 +2289,19 @@ rb_get_xattr_command (glusterd_volinfo_t *volinfo,
priv->workdir, volinfo->volname,
RB_CLIENT_MOUNTPOINT);
- ret = stat (mount_point_path, &buf);
- if (ret) {
- gf_log ("", GF_LOG_DEBUG,
- "stat failed. Could not send "
- " %s command", xattr_key);
- goto out;
- }
+ ret = stat (mount_point_path, &buf);
+ if (ret) {
+ gf_log ("", GF_LOG_DEBUG,
+ "stat failed. Could not send "
+ " %s command", xattr_key);
+ goto out;
+ }
ret = lgetxattr (mount_point_path, xattr_key,
- (char *)(*value),
+ value,
8192);
- if (ret) {
+ if (ret < 0) {
gf_log ("", GF_LOG_DEBUG,
"getxattr failed");
goto out;
@@ -2325,7 +2318,7 @@ rb_do_operation_status (glusterd_volinfo_t *volinfo,
glusterd_brickinfo_t *src_brickinfo,
glusterd_brickinfo_t *dst_brickinfo)
{
- const char *status = NULL;
+ char status[2048] = {0,};
char *status_reply = NULL;
dict_t *ctx = NULL;
int ret = -1;
@@ -2346,7 +2339,7 @@ rb_do_operation_status (glusterd_volinfo_t *volinfo,
ret = rb_get_xattr_command (volinfo, src_brickinfo,
dst_brickinfo, RB_PUMP_STATUS_CMD,
- &status);
+ status);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
"Failed to get status from pump");
@@ -2395,7 +2388,7 @@ out:
}
static int
-glusterd_op_replace_brick (gd1_mgmt_stage_op_req *req)
+glusterd_op_replace_brick (gd1_mgmt_stage_op_req *req, dict_t *rsp_dict)
{
int ret = 0;
dict_t *dict = NULL;
@@ -2485,21 +2478,34 @@ glusterd_op_replace_brick (gd1_mgmt_stage_op_req *req)
gf_log ("", GF_LOG_NORMAL,
"adding src-brick port no");
- ctx = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK);
- if (!ctx) {
- gf_log ("", GF_LOG_ERROR,
- "Operation Context is not present");
- ret = -1;
- goto out;
+ src_brickinfo->port = pmap_registry_search (this,
+ src_brickinfo->path, GF_PMAP_PORT_BRICKSERVER);
+ if (!src_brickinfo->port) {
+ gf_log ("", GF_LOG_ERROR,
+ "Src brick port not available");
+ ret = -1;
+ goto out;
}
- ret = dict_set_int32 (ctx, "src-brick-port",
- src_brickinfo->port);
- if (ret) {
- gf_log ("", GF_LOG_DEBUG,
- "Could not set src-brick port no");
- goto out;
+ if (rsp_dict) {
+ ret = dict_set_int32 (rsp_dict, "src-brick-port", src_brickinfo->port);
+ if (ret) {
+ gf_log ("", GF_LOG_DEBUG,
+ "Could not set src-brick port no");
+ goto out;
+ }
+ } else {
+ ctx = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK);
+ GF_ASSERT (ctx);
+
+ ret = dict_set_int32 (ctx, "src-brick-port", src_brickinfo->port);
+ if (ret) {
+ gf_log ("", GF_LOG_DEBUG,
+ "Could not set src-brick port no");
+ goto out;
+ }
}
+
}
switch (replace_op) {
@@ -2515,8 +2521,18 @@ glusterd_op_replace_brick (gd1_mgmt_stage_op_req *req)
goto out;
}
}
- }
- break;
+
+ if (!glusterd_is_local_addr (src_brickinfo->hostname)) {
+ ret = rb_src_brick_restart (volinfo, src_brickinfo,
+ 1);
+ if (ret) {
+ gf_log ("", GF_LOG_DEBUG,
+ "Could not restart src-brick");
+ goto out;
+ }
+ }
+ break;
+ }
case GF_REPLACE_OP_COMMIT:
{
@@ -2544,6 +2560,7 @@ glusterd_op_replace_brick (gd1_mgmt_stage_op_req *req)
goto out;
}
}
+
}
break;
@@ -3492,8 +3509,23 @@ out:
return ret;
}
-static int
-glusterd_op_ac_rcvd_commit_op_acc (glusterd_op_sm_event_t *event, void *ctx)
+static gf_boolean_t
+rb_check_brick_signin (glusterd_brickinfo_t *brickinfo)
+{
+ gf_boolean_t value;
+
+ value = brickinfo->signed_in;
+
+ if (value == _gf_true) {
+ gf_log ("", GF_LOG_DEBUG,
+ "Brick has signed in. Continuing...");
+ }
+
+ return value;
+}
+
+void
+glusterd_do_replace_brick (void *data)
{
glusterd_volinfo_t *volinfo = NULL;
int32_t op = 0;
@@ -3502,110 +3534,178 @@ glusterd_op_ac_rcvd_commit_op_acc (glusterd_op_sm_event_t *event, void *ctx)
char *src_brick = NULL;
char *dst_brick = NULL;
char *volname = NULL;
+ gf_boolean_t brick_signin = _gf_false;
glusterd_brickinfo_t *src_brickinfo = NULL;
glusterd_brickinfo_t *dst_brickinfo = NULL;
- int ret = 0;
+ glusterd_conf_t *priv = NULL;
- GF_ASSERT (event);
+ int ret = 0;
- opinfo.pending_count--;
+ dict = data;
- if (opinfo.pending_count)
- goto out;
+ GF_ASSERT (THIS);
- dict = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK);
- if (dict) {
+ priv = THIS->private;
+
+ if (priv->timer) {
+ gf_timer_call_cancel (THIS->ctx, priv->timer);
+ priv->timer = NULL;
gf_log ("", GF_LOG_DEBUG,
- "Replace brick operation detected");
+ "Cancelled timer thread");
+ }
- ret = dict_get_int32 (dict, "operation", &op);
- if (ret) {
- gf_log ("", GF_LOG_DEBUG,
- "dict_get on operation failed");
- goto out;
- }
- ret = dict_get_str (dict, "src-brick", &src_brick);
- if (ret) {
- gf_log ("", GF_LOG_ERROR, "Unable to get src brick");
- goto out;
- }
+ gf_log ("", GF_LOG_DEBUG,
+ "Replace brick operation detected");
+ ret = dict_get_int32 (dict, "operation", &op);
+ if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "src brick=%s", src_brick);
+ "dict_get on operation failed");
+ goto out;
+ }
+ ret = dict_get_str (dict, "src-brick", &src_brick);
+ if (ret) {
+ gf_log ("", GF_LOG_ERROR, "Unable to get src brick");
+ goto out;
+ }
- ret = dict_get_str (dict, "dst-brick", &dst_brick);
- if (ret) {
- gf_log ("", GF_LOG_ERROR, "Unable to get dst brick");
- goto out;
- }
+ gf_log ("", GF_LOG_DEBUG,
+ "src brick=%s", src_brick);
- gf_log ("", GF_LOG_DEBUG,
- "dst brick=%s", dst_brick);
+ ret = dict_get_str (dict, "dst-brick", &dst_brick);
+ if (ret) {
+ gf_log ("", GF_LOG_ERROR, "Unable to get dst brick");
+ goto out;
+ }
- ret = dict_get_str (dict, "volname", &volname);
+ gf_log ("", GF_LOG_DEBUG,
+ "dst brick=%s", dst_brick);
- if (ret) {
- gf_log ("", GF_LOG_ERROR, "Unable to get volume name");
- goto out;
- }
+ ret = dict_get_str (dict, "volname", &volname);
- ret = glusterd_volinfo_find (volname, &volinfo);
- if (ret) {
- gf_log ("", GF_LOG_ERROR, "Unable to allocate memory");
- goto out;
- }
+ if (ret) {
+ gf_log ("", GF_LOG_ERROR, "Unable to get volume name");
+ goto out;
+ }
- ret = glusterd_brickinfo_get (src_brick, volinfo, &src_brickinfo);
- if (ret) {
- gf_log ("", GF_LOG_DEBUG, "Unable to get src-brickinfo");
- goto out;
- }
+ ret = glusterd_volinfo_find (volname, &volinfo);
+ if (ret) {
+ gf_log ("", GF_LOG_ERROR, "Unable to allocate memory");
+ goto out;
+ }
- ret = glusterd_brickinfo_from_brick (dst_brick, &dst_brickinfo);
- if (ret) {
- gf_log ("", GF_LOG_DEBUG, "Unable to get dst-brickinfo");
- goto out;
- }
+ ret = glusterd_brickinfo_get (src_brick, volinfo, &src_brickinfo);
+ if (ret) {
+ gf_log ("", GF_LOG_DEBUG, "Unable to get src-brickinfo");
+ goto out;
+ }
- ret = dict_get_int32 (dict, "src-brick-port", &src_port);
- if (ret) {
- gf_log ("", GF_LOG_ERROR, "Unable to get src-brick port");
- goto out;
- }
+ ret = glusterd_brickinfo_from_brick (dst_brick, &dst_brickinfo);
+ if (ret) {
+ gf_log ("", GF_LOG_DEBUG, "Unable to get dst-brickinfo");
+ goto out;
+ }
- src_brickinfo->port = src_port;
+ ret = dict_get_int32 (dict, "src-brick-port", &src_port);
+ if (ret) {
+ gf_log ("", GF_LOG_ERROR, "Unable to get src-brick port");
+ goto out;
+ }
- switch (op) {
- 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_STATUS:
- ret = rb_do_operation_status (volinfo, src_brickinfo, dst_brickinfo);
- break;
- default:
- ret = -1;
- goto out;
- }
+ src_brickinfo->port = src_port;
+ brick_signin = rb_check_brick_signin (src_brickinfo);
+ if (brick_signin == _gf_false) {
+ gf_log ("", GF_LOG_DEBUG,
+ "Marking replace brick to fail due to brick "
+ "not having signed-in in 10secs");
+ ret = -1;
+ goto out;
}
+ switch (op) {
+ 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_STATUS:
+ ret = rb_do_operation_status (volinfo, src_brickinfo, dst_brickinfo);
+ break;
+ default:
+ ret = -1;
+ goto out;
+ }
+
+out:
if (ret)
ret = glusterd_op_sm_inject_event (GD_OP_EVENT_RCVD_RJT, NULL);
else
ret = glusterd_op_sm_inject_event (GD_OP_EVENT_COMMIT_ACC, NULL);
- gf_log ("", GF_LOG_DEBUG, "Returning %d", ret);
+ glusterd_op_sm ();
+}
+
+static int
+glusterd_op_ac_rcvd_commit_op_acc (glusterd_op_sm_event_t *event, void *ctx)
+{
+ glusterd_conf_t *priv = NULL;
+ 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);
+
+ opinfo.pending_count--;
+
+ if (opinfo.pending_count)
+ goto out;
+
+ 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");
+ 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;
+ }
+
+ commit_ack_inject = _gf_true;
out:
+ if (commit_ack_inject) {
+ if (ret)
+ ret = glusterd_op_sm_inject_event (GD_OP_EVENT_RCVD_RJT, NULL);
+ else
+ ret = glusterd_op_sm_inject_event (GD_OP_EVENT_COMMIT_ACC, NULL);
+ }
+
return ret;
}
@@ -4003,8 +4103,8 @@ glusterd_op_sm_transition_state (glusterd_op_info_t *opinfo,
GF_ASSERT (state);
GF_ASSERT (opinfo);
- gf_log ("", GF_LOG_NORMAL, "Transitioning from %d to %d",
- opinfo->state.state, state[event_type].next_state);
+ gf_log ("", GF_LOG_NORMAL, "Transitioning from %d to %d due to event %d",
+ opinfo->state.state, state[event_type].next_state, event_type);
opinfo->state.state =
state[event_type].next_state;
return 0;
@@ -4103,7 +4203,7 @@ glusterd_op_commit_perform (gd1_mgmt_stage_op_req *req, char **op_errstr,
break;
case GD_OP_REPLACE_BRICK:
- ret = glusterd_op_replace_brick (req);
+ ret = glusterd_op_replace_brick (req, rsp_dict);
break;
case GD_OP_SET_VOLUME:
diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.c b/xlators/mgmt/glusterd/src/glusterd-pmap.c
index 1e72b69..cae9341 100644
--- a/xlators/mgmt/glusterd/src/glusterd-pmap.c
+++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c
@@ -367,7 +367,14 @@ fail:
return 0;
}
+static int
+glusterd_brick_update_signin (glusterd_brickinfo_t *brickinfo,
+ gf_boolean_t value)
+{
+ brickinfo->signed_in = value;
+ return 0;
+}
int
gluster_pmap_signup (rpcsvc_request_t *req)
@@ -393,7 +400,6 @@ fail:
return 0;
}
-
int
gluster_pmap_signin (rpcsvc_request_t *req)
{
@@ -421,6 +427,9 @@ fail:
if (args.brick)
free (args.brick);//malloced by xdr
+ if (!ret)
+ glusterd_brick_update_signin (brickinfo, _gf_true);
+
return 0;
}
@@ -454,6 +463,9 @@ fail:
if (args.brick)
free (args.brick);//malloced by xdr
+ if (!ret)
+ glusterd_brick_update_signin (brickinfo, _gf_false);
+
return 0;
}
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h
index abfb72c..500c426 100644
--- a/xlators/mgmt/glusterd/src/glusterd.h
+++ b/xlators/mgmt/glusterd/src/glusterd.h
@@ -73,6 +73,7 @@ typedef struct {
struct list_head hostnames;
struct list_head xprt_list;
glusterd_store_handle_t *handle;
+ gf_timer_t *timer;
} glusterd_conf_t;
typedef enum gf_brick_status {
@@ -87,6 +88,7 @@ struct glusterd_brickinfo {
uuid_t uuid;
int port;
char *logfile;
+ gf_boolean_t signed_in;
glusterd_store_handle_t *shandle;
gf_brick_status_t status;
};
diff --git a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c
index d4b5830..fe21e08 100644
--- a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c
+++ b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c
@@ -579,7 +579,6 @@ glusterd_rb_use_rsp_dict (dict_t *rsp_dict)
int ret = 0;
dict_t *ctx = NULL;
- GF_ASSERT (rsp_dict);
if (rsp_dict) {
ret = dict_get_int32 (rsp_dict, "src-brick-port", &src_port);
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 58ac7d0..2a3502f 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -1892,8 +1892,8 @@ fini (xlator_t *this)
this->private = NULL;
if (conf) {
-// if (conf->rpc)
-// rpc_clnt_destroy (conf->rpc);
+ if (conf->rpc)
+ rpc_clnt_destroy (conf->rpc);
/* Saved Fds */
/* TODO: */