From 4004e667edc88ac9a8c1e9048da0919ec38be4c2 Mon Sep 17 00:00:00 2001 From: N Balachandran Date: Fri, 16 Sep 2016 13:05:59 +0530 Subject: glusterd: Revert 368e26f454fe35477e46dc698fa6b8c3c608ea8d The earlier fix prevented rebalance from starting even if only a single brick of a replica set was down. Change-Id: I8c9a7d4c1fe33f7749568357462f29796e1b832a BUG: 1376671 Signed-off-by: N Balachandran Reviewed-on: http://review.gluster.org/15517 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Raghavendra G Reviewed-by: Atin Mukherjee --- tests/bugs/distribute/bug-860663.t | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tests/bugs/distribute') diff --git a/tests/bugs/distribute/bug-860663.t b/tests/bugs/distribute/bug-860663.t index 12b3e21a9be..43511945cb9 100644 --- a/tests/bugs/distribute/bug-860663.t +++ b/tests/bugs/distribute/bug-860663.t @@ -37,15 +37,13 @@ TEST [ $ORIG_FILE_COUNT -ge 1000 ] # Kill a brick process kill -9 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}1.pid`; -TEST ! $CLI volume rebalance $V0 fix-layout start +TEST $CLI volume rebalance $V0 fix-layout start + +EXPECT_WITHIN $REBALANCE_TIMEOUT "fix-layout failed" fix-layout_status_field $V0; TEST $CLI volume start $V0 force EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/${V0}1 -TEST $CLI volume rebalance $V0 fix-layout start - -EXPECT_WITHIN $REBALANCE_TIMEOUT "fix-layout completed" fix-layout_status_field $V0; - # Unmount and remount to make sure we're doing fresh lookups. TEST umount $M0 TEST glusterfs -s $H0 --volfile-id $V0 $M0; -- cgit