summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd
diff options
context:
space:
mode:
authorRichard Wareing <rwareing@fb.com>2015-07-01 18:44:07 -0700
committerAtin Mukherjee <amukherj@redhat.com>2017-12-07 16:15:50 +0000
commitfaa06328fe58ca85cc3c1c849d293df81efdb9c4 (patch)
tree4bf805fe5df547cfcd7aaeab044e7f67e7bee654 /xlators/mgmt/glusterd
parentd9e9e76188b839447de1d7bdf415a820f13b971b (diff)
Fix management client deadlock
Ping notify is a NOOP for management daemons Reviewers: sshreyas Reviewed By: sshreyas FB-commit-id: ec30b68 Change-Id: I8e121aaaa3ad268e5df057e03aa4b37a403c9ea0 BUG: 1522968 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>
Diffstat (limited to 'xlators/mgmt/glusterd')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c7
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 ca4a60797a1..dbc9a595087 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -6273,11 +6273,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 ();