From: tappro <tappro>
Date: Thu, 10 Dec 2009 11:29:36 +0000 (+0000)
Subject: Branch b1_8
X-Git-Tag: GIT_EPOCH_B1_8~2^4~5
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a4d02f4321866b10f228c2c8e89dd4e3775a3ac9;p=fs%2Flustre-release.git

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
--- 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"