LU-11146 lustre: fix setstripe for specific osts upon dir

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index b7c89ee..d4ada59 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:
@@ -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
 
@@ -2212,7 +2212,7 @@ t32_test() {
 
                # migrate files/dirs to remote MDT, then move them back
                if [ $(lustre_version_code mds1) -ge $(version_code 2.7.50) -a \
-                    $dne_upgrade != "no" ]; then
+                    $dne_upgrade != "no" -a 1 -eq 0 ]; then
                        $r $LCTL set_param -n   \
                                mdt.${fsname}*.enable_remote_dir=1 2>/dev/null
 
@@ -3354,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
@@ -3548,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
@@ -3720,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"
 
@@ -3949,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)
@@ -4376,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"
 
@@ -5338,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 |
@@ -5894,17 +5895,21 @@ test_82a() { # LU-4665
        echo -e "\n$cmd"
        eval $cmd && error "index $start_ost_idx should be in $ost_indices"
 
-       # 5. Specifying OST indices for directory should fail with ENOSUPP.
+       # 5. Specifying OST indices for directory should succeed.
        local dir=$DIR/$tdir/$tdir
        mkdir $dir || error "mkdir $dir failed"
        cmd="$SETSTRIPE -o $ost_indices $dir"
-       echo -e "\n$cmd"
-       eval $cmd && error "$cmd should fail, specifying OST indices" \
-                          "for directory is not supported"
+       if [[ $(lustre_version_code $SINGLEMDS) -gt $(version_code 2.11.53) &&
+          $(lustre_version_code client -gt $(version_code 2.11.53)) ]]; then
+               echo -e "\n$cmd"
+               eval $cmd || error "unable to specify OST indices on directory"
+       else
+               echo "need MDS+client version at least 2.11.53"
+       fi
 
        restore_ostindex
 }
-run_test 82a "specify OSTs for file (succeed) or directory (fail)"
+run_test 82a "specify OSTs for file (succeed) or directory (succeed)"
 
 cleanup_82b() {
        trap 0
@@ -8056,10 +8061,15 @@ test_116() {
        [ $(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
@@ -8090,6 +8100,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