LU-8788 tests: modify create_pool to use as wrapper

[fs/lustre-release.git] / lustre / tests / replay-single.sh

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index d3fc511..b8b7731 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -3074,7 +3074,7 @@ run_test 85a "check the cancellation of unused locks during recovery(IBITS)"
 test_85b() { #bug 16774
        lctl set_param -n ldlm.cancel_unused_locks_before_replay "1"
 
 test_85b() { #bug 16774
        lctl set_param -n ldlm.cancel_unused_locks_before_replay "1"
 

-       do_facet mgs $LCTL pool_new $FSNAME.$TESTNAME ||
+       create_pool $FSNAME.$TESTNAME ||

                error "unable to create pool $TESTNAME"
        do_facet mgs $LCTL pool_add $FSNAME.$TESTNAME $FSNAME-OST0000 ||
                error "unable to add pool $TESTNAME"
                error "unable to create pool $TESTNAME"
        do_facet mgs $LCTL pool_add $FSNAME.$TESTNAME $FSNAME-OST0000 ||
                error "unable to add pool $TESTNAME"


@@ -3294,8 +3294,8 @@ test_90() { # bug 19494
             return 0
         fi
     fi
             return 0
         fi
     fi

-       # maybe effected by previous test
-        wait_osc_import_state mds ost FULL
+       # ensure all OSTs are active to allow allocations
+       wait_osts_up

 
        mkdir $dir || error "mkdir $dir failed"
 
 
        mkdir $dir || error "mkdir $dir failed"