summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2015-03-25 09:21:06 -0400
committerShyamsundar Ranganathan <srangana@redhat.com>2015-03-26 11:44:52 -0700
commit02c045790136fc6e979a82d4d7fa8d1d298478fb (patch)
treea97f5190933206f731043867865a945a13f6b430
parentc54e546040a15d6f1751816f59bdfba430b5fde3 (diff)
tests: fix rebalance_completed
This was causing spurious faiures in bug-884455.t and possibly elsewhere. Change-Id: Iad6b7515ca0c7c485300f79dcd2477efc76877f8 BUG: 1163543 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/9994 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
-rwxr-xr-xtests/basic/quota.t9
-rw-r--r--tests/dht.rc6
-rwxr-xr-xtests/features/weighted-rebalance.t13
3 files changed, 7 insertions, 21 deletions
diff --git a/tests/basic/quota.t b/tests/basic/quota.t
index 47ea832..9fcd0a7 100755
--- a/tests/basic/quota.t
+++ b/tests/basic/quota.t
@@ -155,14 +155,7 @@ TEST $CLI volume add-brick $V0 $H0:$B0/brick{3,4}
TEST $CLI volume rebalance $V0 start;
## Wait for rebalance
-while true; do
- rebalance_completed
- if [ $? -eq 1 ]; then
- sleep 1;
- else
- break;
- fi
-done
+EXPECT_WITHIN $REBALANCE_TIMEOUT "0" rebalance_completed
## <Try creating data beyond limit>
## --------------------------------
diff --git a/tests/dht.rc b/tests/dht.rc
index 4d4979e..45bb276 100644
--- a/tests/dht.rc
+++ b/tests/dht.rc
@@ -76,7 +76,11 @@ function rebalance_completed()
fi
echo $val
- return $val
+ # Do not *return* the value here. If it's non-zero, that will cause
+ # EXPECT_WITHIN (e.g. in bug-884455.t) to return prematurely, leading to
+ # a spurious test failure. Nothing else checks the return value anyway
+ # (they all check the output) so there's no need for it to be non-zero
+ # just because grep didn't find what we want.
}
function remove_brick_completed()
diff --git a/tests/features/weighted-rebalance.t b/tests/features/weighted-rebalance.t
index fbda32e..0d73040 100755
--- a/tests/features/weighted-rebalance.t
+++ b/tests/features/weighted-rebalance.t
@@ -22,17 +22,6 @@ count_files () {
echo $found
}
-wait_for_rebalance () {
- while true; do
- rebalance_completed
- if [ $? -eq 1 ]; then
- sleep 1
- else
- break
- fi
- done
-}
-
get_xattr () {
cmd="getfattr --absolute-names --only-values -n trusted.glusterfs.dht"
$cmd $1 | od -tx1 -An | tr -d ' '
@@ -77,7 +66,7 @@ TEST $CLI volume set $V0 cluster.weighted-rebalance off
# Rebalance again and check that the distribution is even again.
TEST $CLI volume rebalance $V0 start force
-TEST wait_for_rebalance
+EXPECT_WITHIN $REBALANCE_TIMEOUT "0" rebalance_completed
nfiles=$(count_files ${B0}/${V0}2)
#echo $nfiles $(get_xattr ${B0}/${V0}1) $(get_xattr ${B0}/${V0}2) 3>&2 2>&1 1>&3 3>&-
TEST [ $nfiles -le 580 ]