diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bugs/distribute/bug-860663.t | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/bugs/distribute/bug-860663.t b/tests/bugs/distribute/bug-860663.t index f250a736e41..cc2b505080b 100644 --- a/tests/bugs/distribute/bug-860663.t +++ b/tests/bugs/distribute/bug-860663.t @@ -1,5 +1,6 @@ #!/bin/bash +. $(dirname $0)/../../volume.rc . $(dirname $0)/../../include.rc cleanup; @@ -28,23 +29,26 @@ TEST $CLI volume start $V0 ## Mount FUSE TEST glusterfs -s $H0 --volfile-id $V0 $M0; -TEST $(dirname $0)/bug-860663 $M0/files 10000 +TEST $(dirname $0)/bug-860663 $M0/files 1000 ORIG_FILE_COUNT=`ls -l $M0 | wc -l`; -TEST [ $ORIG_FILE_COUNT -ge 10000 ] +TEST [ $ORIG_FILE_COUNT -ge 1000 ] # Kill a brick process kill -9 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}1.pid`; -TEST $CLI volume rebalance $V0 fix-layout start +TEST ! $CLI volume rebalance $V0 fix-layout start -sleep 30; +TEST $CLI volume start $V0 force +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" brick_up_status $V0 $H0 $B0/${V0}1 -TEST ! $(dirname $0)/bug-860663 $M0/files 10000 +TEST $CLI volume rebalance $V0 fix-layout start -TEST $CLI volume start $V0 force +EXPECT_WITHIN $REBALANCE_TIMEOUT "fix-layout completed" rebalance_status_field $V0; -sleep 5; +# Unmount and remount to make sure we're doing fresh lookups. +TEST umount $M0 +TEST glusterfs -s $H0 --volfile-id $V0 $M0; NEW_FILE_COUNT=`ls -l $M0 | wc -l`; |