summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2018-01-02 20:26:31 +0530
committerAtin Mukherjee <amukherj@redhat.com>2018-01-03 01:22:58 +0000
commit0e0fb43d322ade2e1187ea7e4389bf65c66a6ad7 (patch)
tree4ca4def9bbb648ff6da2328b23359ebde953bdd0
parentc8012aaf48179227055a0543e8169630183a39d1 (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. Change-Id: Ib020b967a9b92f1abae9cab9492f0cacec59aaa1 BUG: 1530281 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 b63519eac0f..a5262f41542 100644
--- a/xlators/mgmt/glusterd/src/glusterd-pmap.c
+++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c
@@ -391,7 +391,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)
*/