From 9c192091840967ff1774d05f17538cffef999712 Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Thu, 20 Apr 2017 13:57:27 +0530 Subject: glusterd: set conn->reconnect to null on timer cancellation >Reviewed-on: https://review.gluster.org/17088 >Smoke: Gluster Build System >NetBSD-regression: NetBSD Build System >CentOS-regression: Gluster Build System >Reviewed-by: Jeff Darcy >(cherry picked from commit 98dc1f08c114adea1f4133c12dff0d4c3d75b30d) Change-Id: Ic48e6652f431daeb0db027660f6c9de16d893f08 BUG: 1444128 Signed-off-by: Atin Mukherjee Reviewed-on: https://review.gluster.org/17095 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Jeff Darcy --- xlators/mgmt/glusterd/src/glusterd-utils.c | 1 + 1 file changed, 1 insertion(+) (limited to 'xlators') diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 0c27a3ef102..8be8ed5160d 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); -- cgit