|
 |
21ab4e |
From 6568764e165933d77e20836f1656819d13535d72 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Jeff Darcy <jdarcy@redhat.com>
|
|
|
21ab4e |
Date: Tue, 7 Mar 2017 11:53:04 -0500
|
|
|
21ab4e |
Subject: [PATCH 350/361] glusterfsd: don't quit (in client) on connection
|
|
|
21ab4e |
failure
|
|
|
21ab4e |
|
|
|
21ab4e |
mainline:
|
|
|
21ab4e |
> BUG: 1430042
|
|
|
21ab4e |
> Reviewed-on: https://review.gluster.org/16866
|
|
|
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: Prashanth Pai <ppai@redhat.com>
|
|
|
21ab4e |
(cherry picked from commit 37f25b691c8aeb6c52b7214cf685887eb55a48c4)
|
|
|
21ab4e |
|
|
|
21ab4e |
BUG: 1417815
|
|
|
21ab4e |
Change-Id: I32be91e9db361a45454d6340a4c4ac2d0d7efffc
|
|
|
21ab4e |
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/101326
|
|
|
21ab4e |
Tested-by: Milind Changire <mchangir@redhat.com>
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
glusterfsd/src/glusterfsd-mgmt.c | 6 ++++--
|
|
|
21ab4e |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
|
|
|
21ab4e |
index 1bbc5c8..0dfa505 100644
|
|
|
21ab4e |
--- a/glusterfsd/src/glusterfsd-mgmt.c
|
|
|
21ab4e |
+++ b/glusterfsd/src/glusterfsd-mgmt.c
|
|
|
21ab4e |
@@ -2123,8 +2123,9 @@ mgmt_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
|
|
|
21ab4e |
}
|
|
|
21ab4e |
server = ctx->cmd_args.curr_server;
|
|
|
21ab4e |
if (server->list.next == &ctx->cmd_args.volfile_servers) {
|
|
|
21ab4e |
- //if (!ctx->active)
|
|
|
21ab4e |
+ if (!ctx->active) {
|
|
|
21ab4e |
need_term = 1;
|
|
|
21ab4e |
+ }
|
|
|
21ab4e |
emval = ENOTCONN;
|
|
|
21ab4e |
GF_LOG_OCCASIONALLY (log_ctr2, "glusterfsd-mgmt",
|
|
|
21ab4e |
GF_LOG_INFO,
|
|
|
21ab4e |
@@ -2141,8 +2142,9 @@ mgmt_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
|
|
|
21ab4e |
gf_log ("glusterfsd-mgmt", GF_LOG_ERROR,
|
|
|
21ab4e |
"failed to set remote-host: %s",
|
|
|
21ab4e |
server->volfile_server);
|
|
|
21ab4e |
- //if (!ctx->active)
|
|
|
21ab4e |
+ if (!ctx->active) {
|
|
|
21ab4e |
need_term = 1;
|
|
|
21ab4e |
+ }
|
|
|
21ab4e |
emval = ENOTCONN;
|
|
|
21ab4e |
break;
|
|
|
21ab4e |
}
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|