From: tianzy <tianzy>
Date: Wed, 11 Mar 2009 08:27:41 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: GIT_EPOCH_B1_6~2^5~136
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=7bf268f53fff949b1e914e021a04816e0feda63d;p=fs%2Flustre-release.git

Branch b1_6
fix a problem in test_68 in replay-single.sh
b=18426
i=nathan.rutman
---

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 1ab273a..8355c7b 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -1712,19 +1712,21 @@ test_68 () #bug 13813
     echo $TIMEOUT >> $ldlm_enqueue_min
     do_facet ost1 "echo $TIMEOUT >> $ldlm_enqueue_min_r"
 
-    rm -f $DIR/${tfile}_[1-2]
-    lfs setstripe $DIR/$tfile --index=0 --count=1
+    rm -rf $DIR/$tdir
+    mkdir -p $DIR/$tdir
+    lfs setstripe $DIR/$tdir --index=0 --count=1
 #define OBD_FAIL_LDLM_PAUSE_CANCEL       0x312
     lctl set_param fail_val=$(($TIMEOUT - 1))
     lctl set_param fail_loc=0x80000312
-    cp /etc/profile $DIR/${tfile}_1 || error "1st cp failed $?"
-    lctl set_param fail_val=$((TIMEOUT * 3 / 2))
+    cp /etc/profile $DIR/$tdir/${tfile}_1 || error "1st cp failed $?"
+    lctl set_param fail_val=$((TIMEOUT * 5 / 4))
     lctl set_param fail_loc=0x80000312
-    cp /etc/profile $DIR/${tfile}_2 || error "2nd cp failed $?"
+    cp /etc/profile $DIR/$tdir/${tfile}_2 || error "2nd cp failed $?"
     lctl set_param fail_loc=0
 
     echo $ENQ_MIN >> $ldlm_enqueue_min
     do_facet ost1 "echo $ENQ_MIN_R >> $ldlm_enqueue_min_r"
+    rm -rf $DIR/$tdir
     return 0
 }
 run_test 68 "AT: verify slowing locks"