summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSakshi Bansal <sabansal@redhat.com>2016-07-11 13:34:28 +0530
committerAtin Mukherjee <amukherj@redhat.com>2016-07-21 04:04:36 -0700
commit54e7397505f0a6b218ab70415420371a5755ef0d (patch)
treed298550560f6809a0204012286d3f35eac2df28e
parentf733aa3e62aa0fadbb91b34ecaf639d3e3a4338c (diff)
tests: fix rebalance timing issue
With a start and stop rebalance, the stop command may fail as by that time the rebalance process may not come up. Using the rebalance status commmand to ensure that the rebalance process is up before stoping rebalance. Backport of http://review.gluster.org/14885 > Change-Id: I3d5123cd5dfabde2720428455b257d11b980ce21 > BUG: 1354372 > Signed-off-by: Sakshi Bansal <sabansal@redhat.com> > Reviewed-on: http://review.gluster.org/14885 > Smoke: Gluster Build System <jenkins@build.gluster.org> > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> > CentOS-regression: Gluster Build System <jenkins@build.gluster.org> > Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Change-Id: I3d5123cd5dfabde2720428455b257d11b980ce21 BUG: 1355610 Signed-off-by: Sakshi Bansal <sabansal@redhat.com> Reviewed-on: http://review.gluster.org/14897 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
-rwxr-xr-xtests/bugs/glusterd/bug-963541.t2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/bugs/glusterd/bug-963541.t b/tests/bugs/glusterd/bug-963541.t
index 611626a0d10..ec863346dbf 100755
--- a/tests/bugs/glusterd/bug-963541.t
+++ b/tests/bugs/glusterd/bug-963541.t
@@ -1,6 +1,7 @@
#!/bin/bash
. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
cleanup;
@@ -22,6 +23,7 @@ TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}1 commit
gluster volume status
TEST $CLI volume rebalance $V0 start
+EXPECT_WITHIN $REBALANCE_TIMEOUT "completed" rebalance_status_field $V0
TEST $CLI volume rebalance $V0 stop
TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}2 start