From 31770ace1baf603f486b7e65ce6f78eff7a20e15 Mon Sep 17 00:00:00 2001 From: Sakshi Bansal Date: Thu, 7 Jan 2016 13:09:58 +0530 Subject: tests: remove-brick commit getting executed before migration has completed Backport of http://review.gluster.org/13191 Remove brick commit will fail when it is executed while rebalance is in progress. Hence added a rebalance timeout check before remove-brick commit to enusre that rebalance has completed. Change-Id: I5f388b88a68d19f8d2f52937afb771b95be6deaf BUG: 1311572 Signed-off-by: Sakshi Bansal Reviewed-on: http://review.gluster.org/13511 Tested-by: Raghavendra Talur Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Raghavendra Talur --- tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests') diff --git a/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t b/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t index 657c7f8eb01..5ac2ae2a91e 100644 --- a/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t +++ b/tests/bugs/glusterd/bug-1225716-brick-online-validation-remove-brick.t @@ -23,6 +23,8 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" brick_up_status $V0 $H0 $B0/${V0}1 #remove-brick start should succeed as the brick is up TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}1 start +EXPECT_WITHIN $REBALANCE_TIMEOUT "completed" remove_brick_status_completed_field "$V0 $H0:$B0/${V0}1" + #kill a brick process kill -15 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}1.pid`; -- cgit