summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-utils.c
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2017-02-17 09:42:46 -0500
committerAtin Mukherjee <amukherj@redhat.com>2017-02-18 01:59:10 -0500
commit4e0d4b15717da1f6466133158a26927fb91384b8 (patch)
treece910a8ff7f1b4ace9565a964d8e295ec3fcff4c /xlators/mgmt/glusterd/src/glusterd-utils.c
parent8e7a8ea818a1cc7fb23b412023a735b3939194f4 (diff)
glusterd: take conn->lock around operations on conn->reconnect
Failure to do this could lead to a race in which a timer would be removed twice concurrently, corrupting the timer list (because gf_timer_call_cancel has no internal protection against this) and possibly causing a crash. Change-Id: Ic1a8b612d436daec88fd6cee935db0ae81a47d5c BUG: 1421721 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: https://review.gluster.org/16662 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index c7ec02afe47..0d2518ac384 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -1875,10 +1875,11 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo,
if (rpc) {
brickinfo->rpc = NULL;
conn = &rpc->conn;
+ pthread_mutex_lock (&conn->lock);
if (conn->reconnect) {
(void ) gf_timer_call_cancel (rpc->ctx, conn->reconnect);
- //rpc_clnt_unref (rpc);
}
+ pthread_mutex_unlock (&conn->lock);
rpc_clnt_unref (rpc);
}