diff options
| author | Richard Wareing <rwareing@fb.com> | 2015-07-01 18:44:07 -0700 |
|---|---|---|
| committer | Kevin Vigor <kvigor@fb.com> | 2017-03-06 17:01:52 -0500 |
| commit | 693ef7119dd3d78c55b83e6026a94461f1aae6b4 (patch) | |
| tree | 7eb6bd25a5907863e4738bcfe050ccff14149d4b | |
| parent | 565428a8b2c9ecb7e3183aeb3b5e9e68b67a881d (diff) | |
Fix management client deadlock
Summary: - ping notify is a NOOP for management daemons
Test Plan:
- Built and ran on gfsadsbu (132 nodes) verified nothing hangs and
upgrade is smooth
Reviewers: sshreyas
Reviewed By: sshreyas
FB-commit-id: ec30b68
Change-Id: I8e121aaaa3ad268e5df057e03aa4b37a403c9ea0
Signed-off-by: Kevin Vigor <kvigor@fb.com>
Reviewed-on: https://review.gluster.org/16858
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shreyas Siravara <sshreyas@fb.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 3c21b9755ea..1770d9dd874 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -5165,11 +5165,16 @@ __glusterd_peer_rpc_notify (struct rpc_clnt *rpc, void *mydata, this = THIS; conf = this->private; - if (RPC_CLNT_DESTROY == event) { + switch (event) { + case RPC_CLNT_DESTROY: GF_FREE (peerctx->errstr); GF_FREE (peerctx->peername); GF_FREE (peerctx); return 0; + case RPC_CLNT_PING: + return 0; + default: + break; } rcu_read_lock (); |