summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2018-01-02 20:26:31 +0530
committerjiffin tony Thottan <jthottan@redhat.com>2018-01-10 06:51:34 +0000
commit10e7d18fd65c516a3448f52b8d4c04af68df996c (patch)
tree40db70f3ca4629414713f28ad225881cc443b1fe
parent3db4b99cde76fb321c174666771f0f0cf6e89a95 (diff)
glusterd: Nullify pmap entry for bricks belonging to same port
Commit 30e0b86 tried to address all the stale port issues glusterd had in case of a brick is abruptly killed. For brick multiplexing case because of a bug the portmap entry was not getting removed. This patch addresses the same. >mainline patch : https://review.gluster.org/#/c/19119/ Change-Id: Ib020b967a9b92f1abae9cab9492f0cacec59aaa1 BUG: 1530448 Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-pmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.c b/xlators/mgmt/glusterd/src/glusterd-pmap.c
index 1b547e79a5f..16c4703f53a 100644
--- a/xlators/mgmt/glusterd/src/glusterd-pmap.c
+++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c
@@ -390,7 +390,7 @@ remove:
* there's no xprt either, then we have nothing left worth saving and
* can delete the entire entry.
*/
- if (!pmap->ports[p].xprt) {
+ if (brick_disconnect || !pmap->ports[p].xprt) {
/* If the signout call is being triggered by brick disconnect
* then clean up all the bricks (in case of brick mux)
*/