You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
75 lines
3.0 KiB
75 lines
3.0 KiB
From 80f1b3aedcde02ae25b341519857ba9a5b2fa722 Mon Sep 17 00:00:00 2001 |
|
From: Sheetal Pamecha <spamecha@redhat.com> |
|
Date: Thu, 24 Sep 2020 19:43:29 +0530 |
|
Subject: [PATCH 473/473] glusterd: Fix Add-brick with increasing replica count |
|
failure |
|
|
|
Problem: add-brick operation fails with multiple bricks on same |
|
server error when replica count is increased. |
|
|
|
This was happening because of extra runs in a loop to compare |
|
hostnames and if bricks supplied were less than "replica" count, |
|
the bricks will get compared to itself resulting in above error. |
|
|
|
>Upstream-patch: https://review.gluster.org/#/c/glusterfs/+/25029 |
|
>Fixes: #1508 |
|
|
|
BUG: 1881823 |
|
Change-Id: I8668e964340b7bf59728bb838525d2db062197ed |
|
Signed-off-by: Sheetal Pamecha <spamecha@redhat.com> |
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/213064 |
|
Tested-by: RHGS Build Bot <nigelb@redhat.com> |
|
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com> |
|
--- |
|
tests/bugs/glusterd/brick-order-check-add-brick.t | 21 +++++++++++++++++++++ |
|
xlators/mgmt/glusterd/src/glusterd-utils.c | 4 ++++ |
|
2 files changed, 25 insertions(+) |
|
|
|
diff --git a/tests/bugs/glusterd/brick-order-check-add-brick.t b/tests/bugs/glusterd/brick-order-check-add-brick.t |
|
index 29f0ed1..0be31da 100644 |
|
--- a/tests/bugs/glusterd/brick-order-check-add-brick.t |
|
+++ b/tests/bugs/glusterd/brick-order-check-add-brick.t |
|
@@ -37,4 +37,25 @@ EXPECT '3 x 3 = 9' volinfo_field $V0 'Number of Bricks' |
|
TEST $CLI_1 volume add-brick $V0 $H1:$L1/${V0}_3 $H1:$L1/${V0}_4 $H1:$L1/${V0}_5 force |
|
EXPECT '4 x 3 = 12' volinfo_field $V0 'Number of Bricks' |
|
|
|
+TEST $CLI_1 volume stop $V0 |
|
+TEST $CLI_1 volume delete $V0 |
|
+ |
|
+TEST $CLI_1 volume create $V0 replica 2 $H1:$L1/${V0}1 $H2:$L2/${V0}1 |
|
+EXPECT '1 x 2 = 2' volinfo_field $V0 'Number of Bricks' |
|
+EXPECT 'Created' volinfo_field $V0 'Status' |
|
+ |
|
+TEST $CLI_1 volume start $V0 |
|
+EXPECT 'Started' volinfo_field $V0 'Status' |
|
+ |
|
+#Add-brick with Increasing replica count |
|
+TEST $CLI_1 volume add-brick $V0 replica 3 $H3:$L3/${V0}1 |
|
+EXPECT '1 x 3 = 3' volinfo_field $V0 'Number of Bricks' |
|
+ |
|
+#Add-brick with Increasing replica count from same host should fail |
|
+TEST ! $CLI_1 volume add-brick $V0 replica 5 $H1:$L1/${V0}2 $H1:$L1/${V0}3 |
|
+ |
|
+#adding multiple bricks from same host should fail the brick order check |
|
+TEST ! $CLI_1 volume add-brick $V0 replica 3 $H1:$L1/${V0}{4..6} $H2:$L2/${V0}{7..9} |
|
+EXPECT '1 x 3 = 3' volinfo_field $V0 'Number of Bricks' |
|
+ |
|
cleanup |
|
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c |
|
index 545e688..d25fc8a 100644 |
|
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c |
|
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c |
|
@@ -14908,6 +14908,10 @@ glusterd_check_brick_order(dict_t *dict, char *err_str, int32_t type, |
|
i = 0; |
|
ai_list_tmp1 = cds_list_entry(ai_list->list.next, addrinfo_list_t, list); |
|
|
|
+ if (brick_count < sub_count) { |
|
+ sub_count = brick_count; |
|
+ } |
|
+ |
|
/* Check for bad brick order */ |
|
while (i < brick_count) { |
|
++i; |
|
-- |
|
1.8.3.1 |
|
|
|
|