summaryrefslogtreecommitdiffstats
path: root/glusterfsd
diff options
context:
space:
mode:
authorSakshi <sabansal@redhat.com>2015-06-22 15:52:22 +0530
committerDan Lambright <dlambrig@redhat.com>2015-09-24 16:11:40 -0700
commit69e4d76e69537f8d42b4a11f8785ddaabb58b1dc (patch)
tree8ce8ea7909af43e27b752fd6b172cf5078712b9d /glusterfsd
parentc107569dcd9bff86e37038b2a62118fdd429df50 (diff)
glusterfsd : newly added brick receives fops only after it is started
When new bricks are added in the middle of an on-going fop like 'rm', the volfile changes without waiting for the newly added bricks to get port. Fops are sent to all bricks and may fail on some with ENOTCONN as these bricks may not have a port yet. This patch ensures that the volfile change happens only after all the bricks have a port. > Backport of http://review.gluster.org/#/c/11342/ > Change-Id: I7ed2413475f80d0cc8849fed33036ade8d75a191 > BUG: 1233151 > Signed-off-by: Sakshi <sabansal@redhat.com> > Reviewed-on: http://review.gluster.org/11342 > Reviewed-by: Atin Mukherjee <amukherj@redhat.com> > Tested-by: Atin Mukherjee <amukherj@redhat.com> Change-Id: I7ed2413475f80d0cc8849fed33036ade8d75a191 BUG: 1265890 Signed-off-by: Sakshi <sabansal@redhat.com> Reviewed-on: http://review.gluster.org/12223 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Dan Lambright <dlambrig@redhat.com> Tested-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'glusterfsd')
-rw-r--r--glusterfsd/src/glusterfsd-mgmt.c22
1 files changed, 19 insertions, 3 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index aa7ee4f..8fe7f1b 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -38,6 +38,7 @@
#include "xlator.h"
static gf_boolean_t is_mgmt_rpc_reconnect = _gf_false;
+int need_emancipate = 0;
int glusterfs_mgmt_pmap_signin (glusterfs_ctx_t *ctx);
int glusterfs_volfile_fetch (glusterfs_ctx_t *ctx);
@@ -1576,6 +1577,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
oldvollen = size;
memcpy (oldvolfile, rsp.spec, size);
if (!is_mgmt_rpc_reconnect) {
+ need_emancipate = 1;
glusterfs_mgmt_pmap_signin (ctx);
is_mgmt_rpc_reconnect = _gf_true;
}
@@ -1585,9 +1587,6 @@ out:
free (rsp.spec);
- if (ctx)
- emancipate (ctx, ret);
-
// Stop if server is running at an unsupported op-version
if (ENOTSUP == ret) {
gf_log ("mgmt", GF_LOG_ERROR, "Server is operating at an "
@@ -2075,12 +2074,15 @@ mgmt_pmap_signin2_cbk (struct rpc_req *req, struct iovec *iov, int count,
void *myframe)
{
pmap_signin_rsp rsp = {0,};
+ glusterfs_ctx_t *ctx = NULL;
call_frame_t *frame = NULL;
int ret = 0;
+ ctx = glusterfsd_ctx;
frame = myframe;
if (-1 == req->rpc_status) {
+ ret = -1;
rsp.op_ret = -1;
rsp.op_errno = EINVAL;
goto out;
@@ -2097,9 +2099,13 @@ mgmt_pmap_signin2_cbk (struct rpc_req *req, struct iovec *iov, int count,
if (-1 == rsp.op_ret) {
gf_log (frame->this->name, GF_LOG_ERROR,
"failed to register the port with glusterd");
+ ret = -1;
goto out;
}
out:
+ if (need_emancipate)
+ emancipate (ctx, ret);
+
STACK_DESTROY (frame->root);
return 0;
@@ -2112,6 +2118,7 @@ mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
pmap_signin_rsp rsp = {0,};
call_frame_t *frame = NULL;
int ret = 0;
+ int emancipate_ret = -1;
pmap_signin_req pmap_req = {0, };
cmd_args_t *cmd_args = NULL;
glusterfs_ctx_t *ctx = NULL;
@@ -2120,6 +2127,7 @@ mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
frame = myframe;
if (-1 == req->rpc_status) {
+ ret = -1;
rsp.op_ret = -1;
rsp.op_errno = EINVAL;
goto out;
@@ -2136,6 +2144,7 @@ mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
if (-1 == rsp.op_ret) {
gf_log (frame->this->name, GF_LOG_ERROR,
"failed to register the port with glusterd");
+ ret = -1;
goto out;
}
@@ -2144,6 +2153,7 @@ mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
if (!cmd_args->brick_port2) {
/* We are done with signin process */
+ emancipate_ret = 0;
goto out;
}
@@ -2160,6 +2170,8 @@ mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
return 0;
out:
+ if (need_emancipate && (ret < 0 || !cmd_args->brick_port2))
+ emancipate (ctx, emancipate_ret);
STACK_DESTROY (frame->root);
return 0;
@@ -2171,6 +2183,7 @@ glusterfs_mgmt_pmap_signin (glusterfs_ctx_t *ctx)
call_frame_t *frame = NULL;
pmap_signin_req req = {0, };
int ret = -1;
+ int emancipate_ret = -1;
cmd_args_t *cmd_args = NULL;
char brick_name[PATH_MAX] = {0,};
@@ -2180,6 +2193,7 @@ glusterfs_mgmt_pmap_signin (glusterfs_ctx_t *ctx)
if (!cmd_args->brick_port || !cmd_args->brick_name) {
gf_log ("fsd-mgmt", GF_LOG_DEBUG,
"portmapper signin arguments not given");
+ emancipate_ret = 0;
goto out;
}
@@ -2198,6 +2212,8 @@ glusterfs_mgmt_pmap_signin (glusterfs_ctx_t *ctx)
(xdrproc_t)xdr_pmap_signin_req);
out:
+ if (need_emancipate && ret < 0)
+ emancipate (ctx, emancipate_ret);
return ret;
}