diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2015-03-25 09:21:06 -0400 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2015-03-26 11:44:52 -0700 |
| commit | 02c045790136fc6e979a82d4d7fa8d1d298478fb (patch) | |
| tree | a97f5190933206f731043867865a945a13f6b430 /tests/features | |
| parent | c54e546040a15d6f1751816f59bdfba430b5fde3 (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>
Diffstat (limited to 'tests/features')
| -rwxr-xr-x | tests/features/weighted-rebalance.t | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tests/features/weighted-rebalance.t b/tests/features/weighted-rebalance.t index fbda32e50a2..0d730406fd0 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 ] |