Branch b1_8

b=21240

revert wrongly committed code from another patch

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 38fb3ab..1576552 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -412,7 +412,11 @@ test_20b() { # bug 10480
 
     fail mds                            # start orphan recovery
     wait_recovery_complete mds || error "MDS recovery not done"
-    wait_mds_ost_sync || return 3
+
+    # For interop with 2.0 only:
+    # FIXME just because recovery is done doesn't mean we've finished
+    # orphan cleanup.  Fake it with a sleep for now...
+    sleep 10
 
     AFTERUSED=`df -P $DIR | tail -1 | awk '{ print $3 }'`
     log "before $BEFOREUSED, after $AFTERUSED"