andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Change rebalance status verification

Browse Source 
According to the comment at the following URL
https://bugzilla.redhat.com/show_bug.cgi?id=916226#c2
"success:" can come even before rebalance is completed.
Changed it to check for "completed" instead.

Change-Id: Ibe9d3b75493240f30261ac2a1280f32ef32886da
BUG: 916226
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/4614
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
Pranith Kumar K 2013-03-04 16:23:46 +05:30 committed by Anand Avati
parent 6b393b3ab6
commit b38d98e706
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/bugs/bug-853258.t
View File

@ -20,7 +20,7 @@ EXPECT_WITHIN 15 'Started' volinfo_field $V0 'Status';
# Force assignment of initial ranges.
TEST $CLI volume rebalance $V0 fix-layout start
EXPECT_WITHIN 15 "success:" rebalance_status_field $V0
EXPECT_WITHIN 15 "completed" rebalance_status_field $V0
# Get the original values.
xattrs=""
@ -32,7 +32,7 @@ done
TEST $CLI volume add-brick $V0 $H0:$B0/${V0}3
# Force assignment of initial ranges.
TEST $CLI volume rebalance $V0 fix-layout start
EXPECT_WITHIN 15 "success:" rebalance_status_field $V0
EXPECT_WITHIN 15 "completed" rebalance_status_field $V0
for i in $(seq 0 3); do
xattrs="$xattrs $(dht_get_layout $B0/${V0}$i)"

2
tests/bugs/bug-916226.t
View File

@ -21,6 +21,6 @@ TEST touch $M0/dir{1..10}/files{1..10};
TEST $CLI volume add-brick $V0 $H0:$B0/${V0}4 $H0:/$B0/${V0}5
TEST $CLI volume rebalance $V0 start force
EXPECT_WITHIN 60 "success:" rebalance_status_field $V0
EXPECT_WITHIN 60 "completed" rebalance_status_field $V0
cleanup;

2
tests/volume.rc
View File

@ -27,7 +27,7 @@ function volume_option()
}
function rebalance_status_field {
$CLI volume rebalance $1 status | sed -n '$p' | cut -d' ' -f4
$CLI volume rebalance $1 status | awk '{print $6}' | sed -n 3p
}
function remove_brick_status_completed_field {