|
 |
21ab4e |
From b463c742d78146cc4b9e36f3cbc84d1e06e68b4d Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
Date: Thu, 20 Apr 2017 13:57:27 +0530
|
|
|
21ab4e |
Subject: [PATCH 396/406] glusterd: set conn->reconnect to null on timer
|
|
|
21ab4e |
cancellation
|
|
|
21ab4e |
|
|
|
21ab4e |
>Reviewed-on: https://review.gluster.org/17088
|
|
|
21ab4e |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: Ic48e6652f431daeb0db027660f6c9de16d893f08
|
|
|
21ab4e |
BUG: 1443123
|
|
|
21ab4e |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/104115
|
|
|
21ab4e |
---
|
|
|
21ab4e |
xlators/mgmt/glusterd/src/glusterd-utils.c | 1 +
|
|
|
21ab4e |
1 file changed, 1 insertion(+)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
21ab4e |
index 53ade93..100c6fd 100644
|
|
|
21ab4e |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
21ab4e |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
21ab4e |
@@ -1865,6 +1865,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t *volinfo,
|
|
|
21ab4e |
pthread_mutex_lock (&conn->lock);
|
|
|
21ab4e |
if (conn->reconnect) {
|
|
|
21ab4e |
(void ) gf_timer_call_cancel (rpc->ctx, conn->reconnect);
|
|
|
21ab4e |
+ conn->reconnect = NULL;
|
|
|
21ab4e |
}
|
|
|
21ab4e |
pthread_mutex_unlock (&conn->lock);
|
|
|
21ab4e |
rpc_clnt_unref (rpc);
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|