diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2017-04-20 13:57:27 +0530 |
|---|---|---|
| committer | Raghavendra Talur <rtalur@redhat.com> | 2017-04-24 15:49:26 +0000 |
| commit | 9c192091840967ff1774d05f17538cffef999712 (patch) | |
| tree | 33813e7c203baf9b734544bd91dc82e94068a2c1 /xlators | |
| parent | e6045103b7e010779549bb486c00a07b3c3eb0fc (diff) | |
glusterd: set conn->reconnect to null on timer cancellation
>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>
>(cherry picked from commit 98dc1f08c114adea1f4133c12dff0d4c3d75b30d)
Change-Id: Ic48e6652f431daeb0db027660f6c9de16d893f08
BUG: 1444128
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: https://review.gluster.org/17095
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>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 1 |
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 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); |