diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2017-03-07 11:53:04 -0500 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-03-10 14:49:13 -0500 |
| commit | 2579daf23d6039d2b001d6e2392a952b39317af4 (patch) | |
| tree | a9a4b303492c86ee47cf39c8518d88592f5864fa | |
| parent | 4ee59efe3826745a5359bd36e79957d3b78ec4ba (diff) | |
glusterfsd: don't quit (in client) on connection failure
Backport of:
> eb038c19e2c799e35e72eeb500dfb81efc5567e2
> BUG: 1430042
> Reviewed-on: https://review.gluster.org/16866
Change-Id: I32be91e9db361a45454d6340a4c4ac2d0d7efffc
BUG: 1422781
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: https://review.gluster.org/16886
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: Shyamsundar Ranganathan <srangana@redhat.com>
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index afd6651ae80..89eaa29db25 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -2115,8 +2115,9 @@ mgmt_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event, } server = ctx->cmd_args.curr_server; if (server->list.next == &ctx->cmd_args.volfile_servers) { - //if (!ctx->active) + if (!ctx->active) { need_term = 1; + } emval = ENOTCONN; GF_LOG_OCCASIONALLY (log_ctr2, "glusterfsd-mgmt", GF_LOG_INFO, @@ -2133,8 +2134,9 @@ mgmt_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event, gf_log ("glusterfsd-mgmt", GF_LOG_ERROR, "failed to set remote-host: %s", server->volfile_server); - //if (!ctx->active) + if (!ctx->active) { need_term = 1; + } emval = ENOTCONN; break; } |