LU-2233 tests: improve tests sanityn/40-47

[fs/lustre-release.git] / lustre / tests / sanityn.sh

diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index 94707e3..e22911a 100755 (executable)
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -317,65 +317,52 @@ test_14aa() {
        MULTIPID=$!
 
        $DIR2/$tdir/$tfile && error || true
-       kill -USR1 $MULTIPID
-       wait $MULTIPID || return 2
+       kill $MULTIPID
 }
 run_test 14aa "execution of file open for write returns -ETXTBSY"
 
 test_14ab() {
        test_mkdir $DIR1/$tdir
-       cp -p $(which multiop) $DIR1/$tdir/multiop || error "cp failed"
-       MULTIOP_PROG=$DIR1/$tdir/multiop multiop_bg_pause $TMP/$tfile O_c ||
-               return 1
-       MULTIOP_PID=$!
-       $MULTIOP $DIR2/$tdir/multiop Oc && error "expected error, got success"
-       kill -USR1 $MULTIOP_PID || return 2
-       wait $MULTIOP_PID || return 3
-       rm $TMP/$tfile $DIR1/$tdir/multiop || error "removing multiop"
+       cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed"
+       $DIR1/$tdir/sleep 60 &
+       SLEEP_PID=$!
+       $MULTIOP $DIR2/$tdir/sleep Oc && error "expected error, got success"
+       kill $SLEEP_PID
 }
 run_test 14ab "open(RDWR) of executing file returns -ETXTBSY"
 
 test_14b() { # bug 3192, 7040
        test_mkdir $DIR1/$tdir
-       cp -p $(which multiop) $DIR1/$tdir/multiop || error "cp failed"
-       MULTIOP_PROG=$DIR1/$tdir/multiop multiop_bg_pause $TMP/$tfile O_c ||
-               return 1
-       MULTIOP_PID=$!
-       $TRUNCATE $DIR2/$tdir/multiop 0 && kill -9 $MULTIOP_PID && \
+       cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed"
+       $DIR1/$tdir/sleep 60 &
+       SLEEP_PID=$!
+       $TRUNCATE $DIR2/$tdir/sleep 60 && kill -9 $SLEEP_PID && \
                error "expected truncate error, got success"
-       kill -USR1 $MULTIOP_PID || return 2
-       wait $MULTIOP_PID || return 3
-       cmp $(which multiop) $DIR1/$tdir/multiop || error "binary changed"
-       rm $TMP/$tfile $DIR1/$tdir/multiop || error "removing multiop"
+       kill $SLEEP_PID
+       cmp $(which sleep) $DIR1/$tdir/sleep || error "binary changed"
 }
 run_test 14b "truncate of executing file returns -ETXTBSY ======"
 
 test_14c() { # bug 3430, 7040
        test_mkdir $DIR1/$tdir
-       cp -p $(which multiop) $DIR1/$tdir/multiop || error "cp failed"
-       MULTIOP_PROG=$DIR1/$tdir/multiop multiop_bg_pause $TMP/$tfile O_c ||
-               return 1
-       MULTIOP_PID=$!
-       cp /etc/hosts $DIR2/$tdir/multiop && error "expected error, got success"
-       kill -USR1 $MULTIOP_PID || return 2
-       wait $MULTIOP_PID || return 3
-       cmp $(which multiop) $DIR1/$tdir/multiop || error "binary changed"
-       rm $TMP/$tfile $DIR1/$tdir/multiop || error "removing multiop"
+       cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed"
+       $DIR1/$tdir/sleep 60 &
+       SLEEP_PID=$!
+       cp /etc/hosts $DIR2/$tdir/sleep && error "expected error, got success"
+       kill $SLEEP_PID
+       cmp $(which sleep) $DIR1/$tdir/sleep || error "binary changed"
 }
 run_test 14c "open(O_TRUNC) of executing file return -ETXTBSY =="
 
 test_14d() { # bug 10921
        test_mkdir $DIR1/$tdir
-       cp -p $(which multiop) $DIR1/$tdir/multiop || error "cp failed"
-       MULTIOP_PROG=$DIR1/$tdir/multiop multiop_bg_pause $TMP/$tfile O_c ||
-               return 1
-       MULTIOP_PID=$!
+       cp -p $(which sleep) $DIR1/$tdir/sleep || error "cp failed"
+       $DIR1/$tdir/sleep 60 &
+       SLEEP_PID=$!
        log chmod
-       chmod 600 $DIR1/$tdir/multiop || error "chmod failed"
-       kill -USR1 $MULTIOP_PID || return 2
-       wait $MULTIOP_PID || return 3
-       cmp $(which multiop) $DIR1/$tdir/multiop || error "binary changed"
-       rm $TMP/$tfile $DIR1/$tdir/multiop || error "removing multiop"
+       chmod 600 $DIR1/$tdir/sleep || error "chmod failed"
+       kill $SLEEP_PID
+       cmp $(which sleep) $DIR1/$tdir/sleep || error "binary changed"
 }
 run_test 14d "chmod of executing file is still possible ========"
 
@@ -1473,13 +1460,21 @@ test_39d() { # LU-7310
 }
 run_test 39d "sync write should update mtime"
 
+pdo_sched() {
+       # how long 40-47 take with specific delay
+       # sleep 0.1 # 78s
+       sleep 0.2 # 103s
+       # sleep 0.3 # 124s
+       # sleep 0.5 # 164s
+}
+
 # check that pid exists hence second operation wasn't blocked by first one
 # if it is so then there is no conflict, return 0
 # else second operation is conflicting with first one, return 1
 check_pdo_conflict() {
        local pid=$1
        local conflict=0
-       sleep 1 # to ensure OP1 is finished on client if OP2 is blocked by OP1
+       pdo_sched # to ensure OP1 is finished on client if OP2 is blocked by OP1
        if [[ `ps --pid $pid | wc -l` == 1 ]]; then
                conflict=1
                echo "Conflict"
@@ -1497,8 +1492,7 @@ test_40a() {
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        touch $DIR2
        mkdir $DIR1/$tfile &
-       PID1=$!
-       sleep 1
+       PID1=$!; pdo_sched
        touch $DIR2/$tfile-2
        check_pdo_conflict $PID1 || error "create is blocked"
        mkdir $DIR2/$tfile-3
@@ -1515,6 +1509,7 @@ test_40a() {
 
        #  all operations above shouldn't wait the first one
        check_pdo_conflict $PID1 || error "parallel operation is blocked"
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        wait $PID1
        rm -rf $DIR/$tfile*
        return 0
@@ -1526,8 +1521,7 @@ test_40b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        touch $DIR1/$tfile &
-       PID1=$!
-       sleep 1
+       PID1=$!; pdo_sched
        # open|create
        touch $DIR2/$tfile-2
        check_pdo_conflict $PID1 || error "create is blocked"
@@ -1545,6 +1539,7 @@ test_40b() {
        # all operations above shouldn't wait the first one
 
         check_pdo_conflict $PID1 || error "parallel operation is blocked"
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        wait $PID1
        rm -rf $DIR/$tfile*
        return 0
@@ -1557,8 +1552,7 @@ test_40c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile $DIR1/$tfile-0 &
-       PID1=$!
-       sleep 1
+       PID1=$!; pdo_sched
        # open|create
        touch $DIR2/$tfile-2
        check_pdo_conflict $PID1 || error "create is blocked"
@@ -1576,6 +1570,7 @@ test_40c() {
 
         # all operations above shouldn't wait the first one
        check_pdo_conflict $PID1 || error "parallel operation is blocked"
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        wait $PID1
        rm -rf $DIR/$tfile*
        return 0
@@ -1588,8 +1583,7 @@ test_40d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
+       PID1=$!; pdo_sched
        # open|create
        touch $DIR2/$tfile-2
        check_pdo_conflict $PID1 || error "create is blocked"
@@ -1607,6 +1601,7 @@ test_40d() {
 
        # all operations above shouldn't wait the first one
        check_pdo_conflict $PID1 || error "parallel operation is blocked"
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        wait $PID1
        return 0
 }
@@ -1618,8 +1613,7 @@ test_40e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-0 &
-       PID1=$!
-       sleep 1
+       PID1=$!; pdo_sched
        # open|create
        touch $DIR2/$tfile-2
        check_pdo_conflict $PID1 || error "create is blocked"
@@ -1635,6 +1629,7 @@ test_40e() {
 
        # all operations above shouldn't wait the first one
        check_pdo_conflict $PID1 || error "parallel operation is blocked"
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        wait $PID1
        rm -rf $DIR/$tfile*
        return 0
@@ -1646,10 +1641,12 @@ test_41a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-       PID1=$!
-       sleep 1
-       mkdir $DIR2/$tfile && error "mkdir must fail"
+       PID1=$! ; pdo_sched
+       mkdir $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; echo "mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1659,10 +1656,12 @@ test_41b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-       PID1=$!
-       sleep 1
-       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+       PID1=$! ; pdo_sched
+       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1673,10 +1672,12 @@ test_41c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-       PID1=$!
-       sleep 1
-       link $DIR2/$tfile-2 $DIR2/$tfile && error "link must fail"
+       PID1=$! ; pdo_sched
+       link $DIR2/$tfile-2 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1686,10 +1687,12 @@ test_41d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-       PID1=$!
-       sleep 1
-       rm $DIR2/$tfile || error "unlink must succeed"
+       PID1=$! ; pdo_sched
+       rm $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "unlink must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1700,10 +1703,12 @@ test_41e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile-2 $DIR2/$tfile || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile-2 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1713,10 +1718,12 @@ test_41f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile $DIR2/$tfile-2 || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile $DIR2/$tfile-2 &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1726,10 +1733,12 @@ test_41g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-       PID1=$!
-       sleep 1
-       stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+       PID1=$! ; pdo_sched
+       stat $DIR2/$tfile > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1739,10 +1748,12 @@ test_41h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $MULTIOP $DIR1/$tfile oO_CREAT:O_RDWR:c &
-       PID1=$!
-       sleep 1
-       ls -lia $DIR2/ > /dev/null
+       PID1=$! ; pdo_sched
+       ls -lia $DIR2/ > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+       wait $PID2
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1753,10 +1764,12 @@ test_42a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mkdir $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mkdir $DIR2/$tfile && error "mkdir must fail"
+       PID1=$! ; pdo_sched
+       mkdir $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1766,10 +1779,12 @@ test_42b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mkdir $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+       PID1=$! ; pdo_sched
+       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1780,10 +1795,12 @@ test_42c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mkdir $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       link $DIR2/$tfile-2 $DIR2/$tfile && error "link must fail"
+       PID1=$! ; pdo_sched
+       link $DIR2/$tfile-2 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1793,10 +1810,12 @@ test_42d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mkdir $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       rmdir $DIR2/$tfile || error "unlink must succeed"
+       PID1=$! ; pdo_sched
+       rmdir $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "unlink must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1807,10 +1826,12 @@ test_42e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mkdir $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv -T $DIR2/$tfile-2 $DIR2/$tfile && error "rename must fail"
+       PID1=$! ; pdo_sched
+       mv -T $DIR2/$tfile-2 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "rename must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1820,10 +1841,12 @@ test_42f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mkdir $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile $DIR2/$tfile-2 || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile $DIR2/$tfile-2 &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1833,10 +1856,12 @@ test_42g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mkdir $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+       PID1=$! ; pdo_sched
+       stat $DIR2/$tfile > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1846,10 +1871,12 @@ test_42h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mkdir $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       ls -lia $DIR2/ > /dev/null
+       PID1=$! ; pdo_sched
+       ls -lia $DIR2/ > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+       wait $PID2
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1861,10 +1888,12 @@ test_43a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mkdir $DIR2/$tfile || error "mkdir must succeed"
+       PID1=$! ; pdo_sched
+       mkdir $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "mkdir must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1875,10 +1904,12 @@ test_43b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c || error "create must succeed"
+       PID1=$! ; pdo_sched
+       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "create must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1890,10 +1921,12 @@ test_43c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       link $DIR2/$tfile-2 $DIR2/$tfile || error "link must succeed"
+       PID1=$! ; pdo_sched
+       link $DIR2/$tfile-2 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "link must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1904,10 +1937,12 @@ test_43d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       rm $DIR2/$tfile && error "unlink must fail"
+       PID1=$! ; pdo_sched
+       rm $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "unlink must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1919,10 +1954,12 @@ test_43e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv -u $DIR2/$tfile-2 $DIR2/$tfile || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv -u $DIR2/$tfile-2 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1933,10 +1970,12 @@ test_43f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile $DIR2/$tfile-2 && error "rename must fail"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile $DIR2/$tfile-2 &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "rename must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1947,10 +1986,12 @@ test_43g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       stat $DIR2/$tfile > /dev/null && error "stat must fail"
+       PID1=$! ; pdo_sched
+       stat $DIR2/$tfile > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "stat must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1961,10 +2002,12 @@ test_43h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       ls -lia $DIR2/ > /dev/null
+       PID1=$! ; pdo_sched
+       ls -lia $DIR2/ > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+       wait $PID2
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1976,11 +2019,13 @@ test_43i() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        rm $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       $LFS mkdir -i 1 $DIR2/$tfile || error "remote mkdir must succeed"
+       PID1=$! ; pdo_sched
+       $LFS mkdir -i 1 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 &&
                { wait $PID1; error "remote mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "remote mkdir must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -1992,10 +2037,13 @@ test_44a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2   0x146
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
        mv $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mkdir $DIR2/$tfile && error "mkdir must fail"
-       check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+       PID1=$! ; pdo_sched
+       mkdir $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
+       check_pdo_conflict $PID1 && { wait $PID1; date;error "mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
+       date
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2006,10 +2054,12 @@ test_44b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
        mv $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+       PID1=$! ; pdo_sched
+       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2021,10 +2071,12 @@ test_44c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
        mv $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       link $DIR2/$tfile-3 $DIR2/$tfile && error "link must fail"
+       PID1=$! ; pdo_sched
+       link $DIR2/$tfile-3 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2035,10 +2087,12 @@ test_44d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
        mv $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       rm $DIR2/$tfile || error "unlink must succeed"
+       PID1=$! ; pdo_sched
+       rm $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "unlink must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2051,10 +2105,12 @@ test_44e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
        mv $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile-3 $DIR2/$tfile || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile-3 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2066,10 +2122,12 @@ test_44f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
        mv $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile $DIR2/$tfile-3 || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile $DIR2/$tfile-3 &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2080,10 +2138,12 @@ test_44g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
        mv $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+       PID1=$! ; pdo_sched
+       stat $DIR2/$tfile > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2094,10 +2154,12 @@ test_44h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2    0x146
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
        mv $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       ls -lia $DIR2/ > /dev/null
+       PID1=$! ; pdo_sched
+       ls -lia $DIR2/ > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+       wait $PID2
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2110,11 +2172,13 @@ test_44i() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK2   0x146
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000146
        mv $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       $LFS mkdir -i 1 $DIR2/$tfile && error "remote mkdir must fail"
+       PID1=$! ; pdo_sched
+       $LFS mkdir -i 1 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1;
                                error "remote mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "remote mkdir must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2126,10 +2190,12 @@ test_45a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-2 &
-       PID1=$!
-       sleep 1
-       mkdir $DIR2/$tfile || error "mkdir must succeed"
+       PID1=$! ; pdo_sched
+       mkdir $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "mkdir must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2140,10 +2206,12 @@ test_45b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-2 &
-       PID1=$!
-       sleep 1
-       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c || error "create must succeed"
+       PID1=$! ; pdo_sched
+       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "create must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2155,10 +2223,12 @@ test_45c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-2 &
-       PID1=$!
-       sleep 1
-       link $DIR2/$tfile-3 $DIR2/$tfile || error "link must succeed"
+       PID1=$! ; pdo_sched
+       link $DIR2/$tfile-3 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "link must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2169,10 +2239,12 @@ test_45d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-2 &
-       PID1=$!
-       sleep 1
-       rm $DIR2/$tfile && error "unlink must fail"
+       PID1=$! ; pdo_sched
+       rm $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "unlink must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2184,10 +2256,12 @@ test_45e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-2 &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile-3 $DIR2/$tfile || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile-3 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2198,10 +2272,12 @@ test_45f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-2 &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile $DIR2/$tfile-3 && error "rename must fail"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile $DIR2/$tfile-3 &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "rename must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2212,10 +2288,12 @@ test_45g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-2 &
-       PID1=$!
-       sleep 1
-       stat $DIR2/$tfile > /dev/null && error "stat must fail"
+       PID1=$! ; pdo_sched
+       stat $DIR2/$tfile > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "stat must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2226,10 +2304,11 @@ test_45h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-2 &
-       PID1=$!
-       sleep 1
-       ls -lia $DIR2/ > /dev/null
+       PID1=$! ; pdo_sched
+       ls -lia $DIR2/ > /dev/null &
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+       wait $PID2
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2241,11 +2320,13 @@ test_45i() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        mv $DIR1/$tfile $DIR1/$tfile-2 &
-       PID1=$!
-       sleep 1
-       $LFS mkdir -i 1 $DIR2/$tfile || error "create remote dir must succeed"
+       PID1=$! ; pdo_sched
+       $LFS mkdir -i 1 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1;
                                error "create remote dir isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "create remote dir must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2257,10 +2338,12 @@ test_46a() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mkdir $DIR2/$tfile && error "mkdir must fail"
+       PID1=$! ; pdo_sched
+       mkdir $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2271,10 +2354,12 @@ test_46b() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+       PID1=$! ; pdo_sched
+       $MULTIOP $DIR2/$tfile oO_CREAT:O_EXCL:c &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "create isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2285,10 +2370,12 @@ test_46c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       link $DIR2/$tfile $DIR2/$tfile && error "link must fail"
+       PID1=$! ; pdo_sched
+       link $DIR2/$tfile $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2299,10 +2386,12 @@ test_46d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       rm $DIR2/$tfile || error "unlink must succeed"
+       PID1=$! ; pdo_sched
+       rm $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "unlink isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "unlink must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2314,10 +2403,12 @@ test_46e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile-3 $DIR2/$tfile || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile-3 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2329,10 +2420,12 @@ test_46f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile $DIR2/$tfile-3 || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile $DIR2/$tfile-3 &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2343,10 +2436,12 @@ test_46g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+       PID1=$! ; pdo_sched
+       stat $DIR2/$tfile > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "getattr isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2357,11 +2452,12 @@ test_46h() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       ls -lia $DIR2/ > /dev/null
-       check_pdo_conflict $PID1 && { wait $PID1;
-                       error "readdir isn't blocked"; }
+       PID1=$! ; pdo_sched
+       ls -lia $DIR2/ > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
+       check_pdo_conflict $PID1 && { wait $PID1; error "readdir isn't blocked"; }
+       wait $PID2
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2373,11 +2469,13 @@ test_46i() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        link $DIR1/$tfile-2 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       $LFS mkdir -i 1 $DIR2/$tfile && error "remote mkdir must fail"
+       PID1=$! ; pdo_sched
+       $LFS mkdir -i 1 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1;
                                error "remote mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "remote mkdir must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2389,10 +2487,12 @@ test_47a() {
        [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $LFS mkdir -i 1 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mkdir $DIR2/$tfile && error "mkdir must fail"
+       PID1=$! ; pdo_sched
+       mkdir $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "mkdir isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "mkdir must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2403,11 +2503,13 @@ test_47b() {
        [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $LFS mkdir -i 1 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       multiop $DIR2/$tfile oO_CREAT:O_EXCL:c && error "create must fail"
+       PID1=$! ; pdo_sched
+       multiop $DIR2/$tfile oO_CREAT:O_EXCL:c &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1;
                                        error "create isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "create must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2419,10 +2521,12 @@ test_47c() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $LFS mkdir -i 1 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       link $DIR2/$tfile-2 $DIR2/$tfile && error "link must fail"
+       PID1=$! ; pdo_sched
+       link $DIR2/$tfile-2 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1; error "link isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "link must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2433,11 +2537,13 @@ test_47d() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $LFS mkdir -i 1 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       rmdir $DIR2/$tfile || error "unlink must succeed"
+       PID1=$! ; pdo_sched
+       rmdir $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1;
                                        error "unlink isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rmdir must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2449,11 +2555,13 @@ test_47e() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $LFS mkdir -i 1 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv -T $DIR2/$tfile-2 $DIR2/$tfile && error "rename must fail"
+       PID1=$! ; pdo_sched
+       mv -T $DIR2/$tfile-2 $DIR2/$tfile &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1;
                                        error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -ne 0 ] || error "rename must fail"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2464,11 +2572,13 @@ test_47f() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $LFS mkdir -i 1 $DIR1/$tfile &
-       PID1=$!
-       sleep 1
-       mv $DIR2/$tfile $DIR2/$tfile-2 || error "rename must succeed"
+       PID1=$! ; pdo_sched
+       mv $DIR2/$tfile $DIR2/$tfile-2 &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1;
                                        error "rename isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "rename must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }
@@ -2481,11 +2591,13 @@ test_47g() {
 #define OBD_FAIL_ONCE|OBD_FAIL_MDS_PDO_LOCK    0x145
        do_facet $SINGLEMDS lctl set_param fail_loc=0x80000145
        $LFS mkdir -i 1 $DIR1/$tfile &
-       PID1=$!
-       sleep 2
-       stat $DIR2/$tfile > /dev/null || error "stat must succeed"
+       PID1=$! ; pdo_sched
+       stat $DIR2/$tfile > /dev/null &
+       PID2=$! ; pdo_sched
+       do_facet $SINGLEMDS lctl set_param fail_loc=0
        check_pdo_conflict $PID1 && { wait $PID1;
                                        error "getattr isn't blocked"; }
+       wait $PID2 ; [ $? -eq 0 ] || error "stat must succeed"
        rm -rf $DIR/$tfile*
        return 0
 }