LU-3053 tests: replay-ost-single/6 wait for delete longer

Add similar code from test 7 to test 6 to wait for delete thread and
add variable wait for kbytesfree to settle down.

Test-Parameters: testlist=replay-ost-single mdtfilesystemtype=zfs  mdsfilesystemtype=zfs ostfilesystemtype=zfs
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: I89c1270ac5196ca43c17f3a5bd722c0555960065
Reviewed-on: http://review.whamcloud.com/5875
Tested-by: Hudson
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Li Wei <wei.g.li@intel.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index dde1e49..6cefe8b 100755 (executable)
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -182,7 +182,7 @@ test_6() {
 
        local f=$TDIR/$tfile
        rm -f $f
-       sync && sleep 2 && sync  # wait for delete thread
+       sync && sleep 5 && sync  # wait for delete thread
 
        # wait till space is returned, following
        # (( $before > $after_dd)) test counting on that
@@ -195,13 +195,23 @@ test_6() {
        local stripe_index=$(lfs getstripe -i $f)
 
        sync
-       sleep 4 # ensure we have a fresh statfs and changes have stablalized
+       sleep 2 # ensure we have a fresh statfs
        sync
 
        #define OBD_FAIL_MDS_REINT_NET_REP       0x119
        do_facet $SINGLEMDS "lctl set_param fail_loc=0x80000119"
+
+       # retry till statfs returns useful results
        local after_dd=$(kbytesfree)
-       log "before: $before after_dd: $after_dd"
+       local i=0
+       while (( $before <= $after_dd && $i < 20 )); do
+               sync
+               sleep 1
+               let ++i
+               after_dd=$(kbytesfree)
+       done
+
+       log "before: $before after_dd: $after_dd took $i seconds"
        (( $before > $after_dd )) ||
                error "space grew after dd: before:$before after_dd:$after_dd"
        rm -f $f
@@ -235,6 +245,7 @@ test_7() {
 
        sync
        local after_dd=$(kbytesfree)
+       local i=0
        while (( $before <= $after_dd && $i < 10 )); do
                sync
                sleep 1