LU-11186 ofd: fix for a final oid at sequence

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 93c6b0b..cb43d95 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4,8 +4,8 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 
-# bug number for skipped test:  LU-8972
-ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 101"
+# bug number for skipped test:
+ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 # bug number for skipped test:
@@ -58,8 +58,8 @@ if [[ "$LDISKFS_MKFS_OPTS" != *lazy_itable_init* ]]; then
 fi
 
 [ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
-# bug number for skipped test:         LU-10898
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT   32a 32d"
+# bug number for skipped test:
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 init_logging
@@ -837,7 +837,7 @@ test_22() {
        fi
        mount_client $MOUNT || error "mount_client $MOUNT failed"
        wait_osc_import_state mds ost FULL
-       wait_osc_import_state client ost FULL
+       wait_osc_import_ready client ost
        check_mount || error "check_mount failed"
        pass
 
@@ -1516,16 +1516,22 @@ t32_reload_modules() {
        local node=$1
        local all_removed=false
        local i=0
+       local fstype=$(facet_fstype $SINGLEMDS)
+
+       [ $fstype == "zfs" ] && do_rpc_nodes $node "service zed stop"
 
        while ((i < 20)); do
                echo "Unloading modules on $node: Attempt $i"
-               do_rpc_nodes $node $LUSTRE_RMMOD $(facet_fstype $SINGLEMDS) &&
+               do_rpc_nodes $node $LUSTRE_RMMOD $fstype &&
                        all_removed=true
                do_rpc_nodes $node check_mem_leak || return 1
                if $all_removed; then
                        do_rpc_nodes $node load_modules
                        return 0
                fi
+               if [ $fstype == "zfs" ]; then
+                       do_rpc_nodes $node "$ZPOOL status -v"
+               fi
                sleep 5
                i=$((i + 1))
        done
@@ -2272,6 +2278,9 @@ t32_test() {
                                error_noexit "Unmounting the MDT2"
                                return 1
                        }
+                       if [[ $fstype == zfs ]]; then
+                           $r "$ZPOOL export t32fs-mdt2"
+                       fi
                        shall_cleanup_mdt1=false
                fi
 
@@ -2279,12 +2288,18 @@ t32_test() {
                        error_noexit "Unmounting the MDT"
                        return 1
                }
+               if [[ $fstype == zfs ]]; then
+                   $r "$ZPOOL export t32fs-mdt1"
+               fi
                shall_cleanup_mdt=false
 
                $r $UMOUNT $tmp/mnt/ost || {
                        error_noexit "Unmounting the OST"
                        return 1
                }
+               if [[ $fstype == zfs ]]; then
+                   $r "$ZPOOL export t32fs-ost1"
+               fi
                shall_cleanup_ost=false
 
                t32_reload_modules $node || {
@@ -3339,7 +3354,7 @@ test_46a() {
        # wait until osts in sync
        for (( i=2; i<=$OSTCOUNT; i++ )); do
            wait_osc_import_state mds ost$i FULL
-           wait_osc_import_state client ost$i FULL
+           wait_osc_import_ready client ost$i
        done
 
        #second client see all ost's
@@ -3533,7 +3548,7 @@ lazystatfs() {
        [ $RC1 -ne 0 ] && log "lazystatfs multiop failed"
        wait $PID || { RC1=$?; log "multiop return error "; }
 
-       $LFS df &
+       $LFS df -l &
        PID=$!
        sleep 5
        kill -s 0 $PID
@@ -3705,7 +3720,7 @@ test_50g() {
        setup
        start_ost2 || error "Unable to start OST2"
         wait_osc_import_state mds ost2 FULL
-        wait_osc_import_state client ost2 FULL
+       wait_osc_import_ready client ost2
 
        local PARAM="${FSNAME}-OST0001.osc.active"
 
@@ -3934,6 +3949,10 @@ test_52() {
        done
        echo
 
+       # sync all the data and make sure no pending data on the client,
+       # thus the SOM xattr would not be changed any more.
+       cancel_lru_locks osc
+
        # backup files
        echo backup files to $TMP/$tdir
        local files=$(find $DIR/$tdir -type f -newer $TMP/modified_first)
@@ -4361,9 +4380,6 @@ test_58() { # bug 22658
        setup_noconfig
        mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed"
        createmany -o $DIR/$tdir/$tfile-%d 100
-       # make sure that OSTs do not cancel llog cookies before we unmount the MDS
-#define OBD_FAIL_OBD_LOG_CANCEL_NET      0x601
-       do_facet $SINGLEMDS "$LCTL set_param fail_loc=0x601"
        unlinkmany $DIR/$tdir/$tfile-%d 100
        stop_mds || error "Unable to stop MDS"
 
@@ -5323,7 +5339,7 @@ test_76a() {
        local MAX_DIRTY_MB=$($LCTL get_param -n $MDMB_PARAM |
                head -1)
        echo "max_dirty_mb: $MAX_DIRTY_MB"
-       local NEW_MAX_DIRTY_MB=$((MAX_DIRTY_MB + MAX_DIRTY_MB))
+       local NEW_MAX_DIRTY_MB=$((MAX_DIRTY_MB - 10))
        echo "new_max_dirty_mb: $NEW_MAX_DIRTY_MB"
        do_facet mgs $LCTL set_param -P $MDMB_PARAM=$NEW_MAX_DIRTY_MB
        wait_update $HOSTNAME "$LCTL get_param -n $MDMB_PARAM |
@@ -8038,10 +8054,18 @@ test_116() {
        [ $(facet_fstype $SINGLEMDS) != "ldiskfs" ] &&
                skip "ldiskfs only test" && return
 
+       [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.59) ] &&
+               skip "Need server version at least 2.10.59" && return
+
+       do_facet $SINGLEMDS which mkfs.xfs || {
+               skip_env "No mkfs.xfs installed"
+               return
+       }
+
        stopall
        load_modules
 
-       local tmpmnt=/mnt/$tdir
+       local tmpmnt=$TMP/$tdir
        local mdtimg=$tfile-mdt0
 
        do_facet $SINGLEMDS mkdir -p $tmpmnt
@@ -8072,6 +8096,28 @@ test_116() {
 }
 run_test 116 "big size MDT support"
 
+test_122() {
+       [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+       [[ $(lustre_version_code ost1) -ge $(version_code 2.11.53) ]] ||
+               { skip "Need OST version at least 2.11.53" && return 0; }
+
+
+       reformat
+       LOAD_MODULES_REMOTE=true load_modules
+#define OBD_FAIL_OFD_SET_OID 0x1e0
+       do_facet ost1 $LCTL set_param fail_loc=0x00001e0
+
+       setupall
+       $LFS mkdir -i1 -c1 $DIR/$tdir
+       $LFS setstripe -i0 -c1 $DIR/$tdir
+       do_facet ost1 $LCTL set_param fail_loc=0
+       createmany -o $DIR/$tdir/file_ 1000 ||
+               error "Fail to create a new sequence"
+
+       reformat
+}
+run_test 122 "Check OST sequence update"
+
 if ! combined_mgs_mds ; then
        stop mgs
 fi