|
 |
d1681e |
From 5138cf57c7a61eed4bb33c4fa2e21f6fb7bd56fd Mon Sep 17 00:00:00 2001
|
|
|
d1681e |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
d1681e |
Date: Tue, 20 Feb 2018 18:37:56 +0530
|
|
|
d1681e |
Subject: [PATCH 163/180] glusterd: compare uuid instead of hostname while
|
|
|
d1681e |
finding compatible brick
|
|
|
d1681e |
|
|
|
d1681e |
If the above is not done, bricks created with different IP/hostname will
|
|
|
d1681e |
not be compatible with brick multiplexing.
|
|
|
d1681e |
|
|
|
d1681e |
>upstream mainline patch : https://review.gluster.org/#/c/19601/
|
|
|
d1681e |
|
|
|
d1681e |
Change-Id: I508eb59b0632df4b48466cca411c7ec6cc6bd577
|
|
|
d1681e |
BUG: 1547012
|
|
|
d1681e |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
d1681e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/131110
|
|
|
d1681e |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
d1681e |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
d1681e |
---
|
|
|
d1681e |
xlators/mgmt/glusterd/src/glusterd-utils.c | 2 +-
|
|
|
d1681e |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
d1681e |
|
|
|
d1681e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
d1681e |
index 5deacde..9ccd718 100644
|
|
|
d1681e |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
d1681e |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
d1681e |
@@ -5656,7 +5656,7 @@ find_compat_brick_in_vol (glusterd_conf_t *conf,
|
|
|
d1681e |
if (other_brick == brickinfo) {
|
|
|
d1681e |
continue;
|
|
|
d1681e |
}
|
|
|
d1681e |
- if (strcmp (brickinfo->hostname, other_brick->hostname) != 0) {
|
|
|
d1681e |
+ if (gf_uuid_compare (brickinfo->uuid, other_brick->uuid)) {
|
|
|
d1681e |
continue;
|
|
|
d1681e |
}
|
|
|
d1681e |
if (other_brick->status != GF_BRICK_STARTED &&
|
|
|
d1681e |
--
|
|
|
d1681e |
1.8.3.1
|
|
|
d1681e |
|