21ab4e
From ef169f5029bd31601d691cbee5ef5c0117bfcfef Mon Sep 17 00:00:00 2001
21ab4e
From: N Balachandran <nbalacha@redhat.com>
21ab4e
Date: Mon, 24 Jul 2017 17:48:47 +0530
21ab4e
Subject: [PATCH 572/576] cluster/dht: Correct iterator for decommissioned
21ab4e
 bricks
21ab4e
21ab4e
Corrected the iterator for looping over the list of
21ab4e
decommissioned bricks while checking if the new target
21ab4e
determined because of min-free-disk values has been
21ab4e
decommissioned.
21ab4e
21ab4e
> BUG: 1474318
21ab4e
> Signed-off-by: N Balachandran <nbalacha@redhat.com>
21ab4e
> Reviewed-on: https://review.gluster.org/17861
21ab4e
> Reviewed-by: Susant Palai <spalai@redhat.com>
21ab4e
21ab4e
Change-Id: Iee778547eb7370a8069e954b5d629fcedf54e59b
21ab4e
BUG: 1474284
21ab4e
Signed-off-by: N Balachandran <nbalacha@redhat.com>
21ab4e
Reviewed-on: https://code.engineering.redhat.com/gerrit/113511
21ab4e
Reviewed-by: Susant Palai <spalai@redhat.com>
21ab4e
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
21ab4e
---
21ab4e
 xlators/cluster/dht/src/dht-rebalance.c | 2 +-
21ab4e
 1 file changed, 1 insertion(+), 1 deletion(-)
21ab4e
21ab4e
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
21ab4e
index c60ce27..9ae4062 100644
21ab4e
--- a/xlators/cluster/dht/src/dht-rebalance.c
21ab4e
+++ b/xlators/cluster/dht/src/dht-rebalance.c
21ab4e
@@ -1023,7 +1023,7 @@ find_new_subvol:
21ab4e
                  * removed-brick, do not mark the error as failure */
21ab4e
                 if (conf->decommission_subvols_cnt) {
21ab4e
                         *ignore_failure = _gf_true;
21ab4e
-                        for (i = 0; i < conf->decommission_subvols_cnt; i++) {
21ab4e
+                        for (i = 0; i < conf->subvolume_cnt; i++) {
21ab4e
                                 if (conf->decommissioned_bricks[i] == from) {
21ab4e
                                         *ignore_failure = _gf_false;
21ab4e
                                          break;
21ab4e
-- 
21ab4e
1.8.3.1
21ab4e