LU-13578 test: sleep longer in sanity test_39

[fs/lustre-release.git] / lustre / tests / sanity-selinux.sh

diff --git a/lustre/tests/sanity-selinux.sh b/lustre/tests/sanity-selinux.sh
index 191333e..90b5b9c 100755 (executable)
--- a/lustre/tests/sanity-selinux.sh
+++ b/lustre/tests/sanity-selinux.sh
@@ -120,7 +120,7 @@ test_2a() {
 
        mds_path=${mds_path#/}
 
-       $LFS setdirstripe -i0 -c1 ${DIR}/$tdir || error "create dir failed"
+       mkdir_on_mdt0 ${DIR}/$tdir || error "create dir failed"
        mkdir $dirname || error "cannot mkdir $dirname"
 
        local xattrval=$(check_selinux_xattr "mds1" $mds_path)
@@ -639,9 +639,12 @@ test_21b() {
        [ "$MDS1_VERSION" -lt $(version_code 2.11.56) ] &&
                skip "Need MDS >= 2.11.56"
 
+       stack_trap "restore_opencache" EXIT
+       disable_opencache
+
        local sepol
 
-       mkdir -p $DIR/$tdir || error "failed to create $DIR/$tdir"
+       mkdir_on_mdt0 $DIR/$tdir || error "failed to create $DIR/$tdir"
        echo test > $DIR/$tdir/toopen ||
                error "failed to write to $DIR/$tdir/toopen"
        touch $DIR/$tdir/ftoremove ||