summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2017-04-20 13:57:27 +0530
committerJeff Darcy <jeff@pl.atyp.us>2017-04-20 11:14:17 -0400
commit98dc1f08c114adea1f4133c12dff0d4c3d75b30d (patch)
tree8a56290ea6b0018bcac99121dfcc4bbf4d05457c
parent561766e45a323be3d5c521fdb47f68d71cea776e (diff)
glusterd: set conn->reconnect to null on timer cancellation
Change-Id: Ic48e6652f431daeb0db027660f6c9de16d893f08 BUG: 1443896 Signed-off-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-on: https://review.gluster.org/17088 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: Jeff Darcy <jeff@pl.atyp.us>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 91a4087c4b2..a8ccd34d487 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -1878,6 +1878,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo,
pthread_mutex_lock (&conn->lock);
if (conn->reconnect) {
(void ) gf_timer_call_cancel (rpc->ctx, conn->reconnect);
+ conn->reconnect = NULL;
}
pthread_mutex_unlock (&conn->lock);
rpc_clnt_unref (rpc);