LU-2724 ptlrpc: skip NULL obd_svc_stats in lprocfs_rd_import()

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

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 16a0410..940e64c 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2461,6 +2461,8 @@ test_34h() {
        local sz=1000
 
        dd if=/dev/zero of=$DIR/$tfile bs=1M count=10 || error
+       sync # Flush the cache so that multiop below does not block on cache
+            # flush when getting the group lock
        $MULTIOP $DIR/$tfile OG${gid}T${sz}g${gid}c &
        MULTIPID=$!
        sleep 2
@@ -8272,6 +8274,36 @@ test_133e() {
 }
 run_test 133e "Verifying OST {read,write}_bytes nid stats ================="
 
+test_133f() {
+       local proc_dirs="/proc/fs/lustre/ /proc/sys/lnet/ /proc/sys/lustre/"
+       local facet
+
+       # First without trusting modes.
+       find $proc_dirs \
+               -exec cat '{}' \; &> /dev/null
+
+       # Second verifying readability.
+       find $proc_dirs \
+               -type f \
+               -readable \
+               -exec cat '{}' \; > /dev/null ||
+                       error "proc file read failed"
+
+       for facet in $SINGLEMDS ost1; do
+               do_facet $facet find $proc_dirs \
+                       -not -name req_history \
+                       -exec cat '{}' \\\; &> /dev/null
+
+           do_facet $facet     find $proc_dirs \
+                       -not -name req_history \
+                       -type f \
+                       -readable \
+                       -exec cat '{}' \\\; > /dev/null ||
+                               error "proc file read failed"
+       done
+}
+run_test 133f "Check for LBUGs/Oopses/unreadable files in /proc"
+
 test_140() { #bug-17379
        [ $PARALLEL == "yes" ] && skip "skip parallel run" && return
         test_mkdir -p $DIR/$tdir || error "Creating dir $DIR/$tdir"
@@ -9394,23 +9426,26 @@ run_test 184b "Forbidden layout swap (will generate errors)"
 test_184c() {
        check_swap_layouts_support && return 0
 
-       dir0=$DIR/$tdir/$testnum
+       local dir0=$DIR/$tdir/$testnum
        mkdir -p $dir0 || error "creating dir $dir0"
-       ref1=$dir0/ref1
-       ref2=$dir0/ref2
-       file1=$dir0/file1
-       file2=$dir0/file2
+
+       local ref1=$dir0/ref1
+       local ref2=$dir0/ref2
+       local file1=$dir0/file1
+       local file2=$dir0/file2
        # create a file large enough for the concurent test
        dd if=/dev/urandom of=$ref1 bs=1M count=$((RANDOM % 50 + 20))
        dd if=/dev/urandom of=$ref2 bs=1M count=$((RANDOM % 50 + 20))
        echo "ref file size: ref1(`stat -c %s $ref1`), ref2(`stat -c %s $ref2`)"
 
        cp $ref2 $file2
-       dd if=$ref1 of=$file1 bs=64k &
+       dd if=$ref1 of=$file1 bs=16k &
+       local DD_PID=$!
+
        sleep 0.$((RANDOM % 5 + 1))
 
        $LFS swap_layouts $file1 $file2
-       rc=$?
+       local rc=$?
        wait $DD_PID
        [[ $? == 0 ]] || error "concurrent write on $file1 failed"
        [[ $rc == 0 ]] || error "swap of $file1 and $file2 failed"
@@ -9421,7 +9456,7 @@ test_184c() {
        remaining=$((remaining - copied))
        echo "Copied $copied bytes before swapping layout..."
 
-       cmp -n $copied $file1 $ref2 ||
+       cmp -n $copied $file1 $ref2 | grep differ &&
                error "Content mismatch [0, $copied) of ref2 and file1"
        cmp -n $copied $file2 $ref1 ||
                error "Content mismatch [0, $copied) of ref1 and file2"