LU-11367 som: integrate LSOM with lfs find

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

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index c60de09..9ae38c5 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -4156,15 +4156,11 @@ run_test 43A "execution of file opened for write should return -ETXTBSY"
 
 test_43a() {
        test_mkdir $DIR/$tdir
-       cp -p $(which $MULTIOP) $DIR/$tdir/multiop ||
-               cp -p multiop $DIR/$tdir/multiop
-       MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/$tfile.junk O_c ||
-               error "multiop open $TMP/$tfile.junk failed"
-       rm $TMP/$tfile.junk     # delete junk file on close (not part of test)
-       MULTIOP_PID=$!
-       $MULTIOP $DIR/$tdir/multiop Oc && error "expected error, got success"
-       kill -USR1 $MULTIOP_PID || error "kill -USR1 PID $MULTIOP_PID failed"
-       wait $MULTIOP_PID || error "wait PID $MULTIOP_PID failed"
+       cp -p $(which sleep) $DIR/$tdir/sleep || error "can't copy"
+       $DIR/$tdir/sleep 60 &
+       SLEEP_PID=$!
+       $MULTIOP $DIR/$tdir/sleep Oc && error "expected error, got success"
+       kill $SLEEP_PID
 }
 run_test 43a "open(RDWR) of file being executed should return -ETXTBSY"
 
@@ -4172,15 +4168,11 @@ test_43b() {
        [ $PARALLEL == "yes" ] && skip "skip parallel run"
 
        test_mkdir $DIR/$tdir
-       cp -p $(which $MULTIOP) $DIR/$tdir/multiop ||
-               cp -p multiop $DIR/$tdir/multiop
-       MULTIOP_PROG=$DIR/$tdir/multiop multiop_bg_pause $TMP/$tfile.junk O_c ||
-               error "multiop open $TMP/$tfile.junk failed"
-       rm $TMP/$tfile.junk     # delete junk file on close (not part of test)
-       MULTIOP_PID=$!
-       $TRUNCATE $DIR/$tdir/multiop 0 && error "expected error, got success"
-       kill -USR1 $MULTIOP_PID || error "kill -USR1 PID $MULTIOP_PID failed"
-       wait $MULTIOP_PID || error "wait PID $MULTIOP_PID failed"
+       cp -p $(which sleep) $DIR/$tdir/sleep || error "can't copy"
+       $DIR/$tdir/sleep 60 &
+       SLEEP_PID=$!
+       $TRUNCATE $DIR/$tdir/sleep 0 && error "expected error, got success"
+       kill $SLEEP_PID
 }
 run_test 43b "truncate of file being executed should return -ETXTBSY"
 
@@ -5217,39 +5209,73 @@ test_56r() {
        setup_56 $dir $NUMFILES $NUMDIRS
 
        local expected=12
-       local cmd="$LFS find -size 0 -type f $dir"
+       local cmd="$LFS find -size 0 -type f -lazy $dir"
        local nums=$($cmd | wc -l)
 
        [ $nums -eq $expected ] ||
                error "'$cmd' wrong: found $nums, expected $expected"
+       cmd="$LFS find -size 0 -type f $dir"
+       nums=$($cmd | wc -l)
+       [ $nums -eq $expected ] ||
+               error "'$cmd' wrong: found $nums, expected $expected"
+
        expected=0
+       cmd="$LFS find ! -size 0 -type f -lazy $dir"
+       nums=$($cmd | wc -l)
+       [ $nums -eq $expected ] ||
+               error "'$cmd' wrong: found $nums, expected $expected"
        cmd="$LFS find ! -size 0 -type f $dir"
        nums=$($cmd | wc -l)
        [ $nums -eq $expected ] ||
                error "'$cmd' wrong: found $nums, expected $expected"
+
        echo "test" > $dir/$tfile
        echo "test2" > $dir/$tfile.2 && sync
        expected=1
+       cmd="$LFS find -size 5 -type f -lazy $dir"
+       nums=$($cmd | wc -l)
+       [ $nums -eq $expected ] ||
+               error "'$cmd' wrong: found $nums, expected $expected"
        cmd="$LFS find -size 5 -type f $dir"
        nums=$($cmd | wc -l)
        [ $nums -eq $expected ] ||
                error "'$cmd' wrong: found $nums, expected $expected"
+
        expected=1
+       cmd="$LFS find -size +5 -type f -lazy $dir"
+       nums=$($cmd | wc -l)
+       [ $nums -eq $expected ] ||
+               error "'$cmd' wrong: found $nums, expected $expected"
        cmd="$LFS find -size +5 -type f $dir"
        nums=$($cmd | wc -l)
        [ $nums -eq $expected ] ||
                error "'$cmd' wrong: found $nums, expected $expected"
+
        expected=2
+       cmd="$LFS find -size +0 -type f -lazy $dir"
+       nums=$($cmd | wc -l)
+       [ $nums -eq $expected ] ||
+               error "'$cmd' wrong: found $nums, expected $expected"
        cmd="$LFS find -size +0 -type f $dir"
        nums=$($cmd | wc -l)
        [ $nums -eq $expected ] ||
                error "'$cmd' wrong: found $nums, expected $expected"
+
        expected=2
+       cmd="$LFS find ! -size -5 -type f -lazy $dir"
+       nums=$($cmd | wc -l)
+       [ $nums -eq $expected ] ||
+               error "'$cmd' wrong: found $nums, expected $expected"
        cmd="$LFS find ! -size -5 -type f $dir"
        nums=$($cmd | wc -l)
        [ $nums -eq $expected ] ||
                error "'$cmd' wrong: found $nums, expected $expected"
+
        expected=12
+       cmd="$LFS find -size -5 -type f -lazy $dir"
+       nums=$($cmd | wc -l)
+       [ $nums -eq $expected ] ||
+               error "'$cmd' wrong: found $nums, expected $expected"
        cmd="$LFS find -size -5 -type f $dir"
        nums=$($cmd | wc -l)
        [ $nums -eq $expected ] ||