|
 |
7c2869 |
From d44694d9b16fb6ca686bd4ce46a40cf5f91232d6 Mon Sep 17 00:00:00 2001
|
|
|
7c2869 |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
7c2869 |
Date: Tue, 2 Jan 2018 20:26:31 +0530
|
|
|
7c2869 |
Subject: [PATCH 645/645] glusterd: Nullify pmap entry for bricks belonging to
|
|
|
7c2869 |
same port
|
|
|
7c2869 |
|
|
|
7c2869 |
Commit 30e0b86 tried to address all the stale port issues glusterd had
|
|
|
7c2869 |
in case of a brick is abruptly killed. For brick multiplexing case
|
|
|
7c2869 |
because of a bug the portmap entry was not getting removed. This patch
|
|
|
7c2869 |
addresses the same.
|
|
|
7c2869 |
|
|
|
7c2869 |
>upstream mainline patch : https://review.gluster.org/#/c/19119/
|
|
|
7c2869 |
|
|
|
7c2869 |
Change-Id: Ib020b967a9b92f1abae9cab9492f0cacec59aaa1
|
|
|
7c2869 |
BUG: 1530217
|
|
|
7c2869 |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
7c2869 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/126775
|
|
|
7c2869 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
7c2869 |
---
|
|
|
7c2869 |
xlators/mgmt/glusterd/src/glusterd-pmap.c | 2 +-
|
|
|
7c2869 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7c2869 |
|
|
|
7c2869 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.c b/xlators/mgmt/glusterd/src/glusterd-pmap.c
|
|
|
7c2869 |
index 1789ef3..68f0f27 100644
|
|
|
7c2869 |
--- a/xlators/mgmt/glusterd/src/glusterd-pmap.c
|
|
|
7c2869 |
+++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c
|
|
|
7c2869 |
@@ -388,7 +388,7 @@ remove:
|
|
|
7c2869 |
* there's no xprt either, then we have nothing left worth saving and
|
|
|
7c2869 |
* can delete the entire entry.
|
|
|
7c2869 |
*/
|
|
|
7c2869 |
- if (!pmap->ports[p].xprt) {
|
|
|
7c2869 |
+ if (brick_disconnect || !pmap->ports[p].xprt) {
|
|
|
7c2869 |
/* If the signout call is being triggered by brick disconnect
|
|
|
7c2869 |
* then clean up all the bricks (in case of brick mux)
|
|
|
7c2869 |
*/
|
|
|
7c2869 |
--
|
|
|
7c2869 |
1.8.3.1
|
|
|
7c2869 |
|