LU-6632 mgs: dont remove EXCLUDE records on lctl replace_nids

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 7bb19a2..9149940 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -8,13 +8,6 @@ ONLY=${ONLY:-"$*"}
 ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 101"
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
-if [ "$FAILURE_MODE" = "HARD" ]; then
-       CONFIG_EXCEPTIONS="24a " &&
-       echo "Except the tests: $CONFIG_EXCEPTIONS for " \
-            "FAILURE_MODE=$FAILURE_MODE, b=23573" &&
-               ALWAYS_EXCEPT="$ALWAYS_EXCEPT $CONFIG_EXCEPTIONS"
-fi
-
 # bug number for skipped test:
 # a tool to create lustre filesystem images
 ALWAYS_EXCEPT="32newtarball $ALWAYS_EXCEPT"
@@ -571,22 +564,6 @@ test_9() {
 }
 run_test 9 "test ptldebug and subsystem for mkfs"
 
-is_blkdev () {
-       local facet=$1
-       local dev=$2
-       local size=${3:-""}
-
-       local rc=0
-       do_facet $facet "test -b $dev" || rc=1
-       if [[ "$size" ]]; then
-               local in=$(do_facet $facet "dd if=$dev of=/dev/null bs=1k \
-                          count=1 skip=$size 2>&1" |
-                       awk '($3 == "in") { print $1 }')
-               [[ $in  = "1+0" ]] || rc=1
-       fi
-       return $rc
-}
-
 #
 # Test 16 was to "verify that lustre will correct the mode of OBJECTS".
 # But with new MDS stack we don't care about the mode of local objects
@@ -4669,6 +4646,13 @@ test_66() {
        local OST1_NID=$(do_facet ost1 $LCTL list_nids | head -1)
        local MDS_NID=$(do_facet $SINGLEMDS $LCTL list_nids | head -1)
 
+       # add EXCLUDE records to config log, they are not to be
+       # removed by lctl replace_nids
+       set_conf_param_and_check mds                                    \
+           "$LCTL get_param -n osc.$FSNAME-OST0000-osc-MDT0000.active" \
+           "$FSNAME-OST0000.osc.active"                                \
+           "0"
+
        echo "replace_nids should fail if MDS, OSTs and clients are UP"
        do_facet mgs $LCTL replace_nids $FSNAME-OST0000 $OST1_NID &&
                error "replace_nids fail"
@@ -4724,7 +4708,14 @@ test_66() {
                stop_mds || error "Unable to stop MDS"
        fi
 
-       setup_noconfig
+       start_mgsmds || error "start mgsmds failed"
+       set_conf_param_and_check mds                                    \
+           "$LCTL get_param -n osc.$FSNAME-OST0000-osc-MDT0000.active" \
+           "$FSNAME-OST0000.osc.active"                                \
+           "1"
+       start_ost || error "unable to start OST"
+       mount_client $MOUNT || error "mount client failed"
+
        check_mount || error "error after nid replace"
        cleanup || error "cleanup failed"
        reformat
@@ -6192,7 +6183,7 @@ test_86() {
 run_test 86 "Replacing mkfs.lustre -G option"
 
 test_87() { #LU-6544
-       [[ $(lustre_version_code $SINGLEMDS1) -ge $(version_code 2.9.51) ]] ||
+       [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.9.51) ]] ||
                { skip "Need MDS version at least 2.9.51" && return; }
        [[ $(facet_fstype $SINGLEMDS) != ldiskfs ]] &&
                { skip "ldiskfs only test" && return; }
@@ -7553,7 +7544,7 @@ test_106() {
 #shows that osp code is buggy
        do_facet mds1 $LCTL set_param fail_loc=0 fail_val=0
 
-       cleanupall
+       stopall
 }
 run_test 106 "check osp llog processing when catalog is wrapped"
 
@@ -8046,6 +8037,44 @@ test_115() {
 }
 run_test 115 "Access large xattr with inodes number over 2TB"
 
+test_116() {
+       [ $(facet_fstype $SINGLEMDS) != "ldiskfs" ] &&
+               skip "ldiskfs only test" && return
+
+       stopall
+       load_modules
+
+       local tmpmnt=/mnt/$tdir
+       local mdtimg=$tfile-mdt0
+
+       do_facet $SINGLEMDS mkdir -p $tmpmnt
+       stack_trap "do_facet $SINGLEMDS rmdir $tmpmnt" EXIT
+
+       do_facet $SINGLEMDS touch $TMP/$mdtimg
+       stack_trap "do_facet $SINGLEMDS rm -f $TMP/$mdtimg" EXIT
+       do_facet $SINGLEMDS mkfs -t xfs -d file,size=1t,name=$TMP/$mdtimg ||
+               error "mkfs temporary xfs image"
+
+       do_facet $SINGLEMDS mount $TMP/$mdtimg $tmpmnt ||
+               error "mount temporary xfs image"
+       stack_trap "do_facet $SINGLEMDS umount $tmpmnt" EXIT
+       local old_mdssize=$MDSSIZE
+       local old_mdsisize=$MDSISIZE
+
+       MDSSIZE=$((17 * 1024 * 1024 * 1024)) # 17T MDT
+       MDSISIZE=$((16 << 20))
+       local opts17t="$(mkfs_opts $SINGLEMDS)"
+
+       MDSSIZE=$old_mdssize
+       MDSISIZE=$old_mdsisize
+       do_facet $SINGLEMDS $MKFS $opts17t $tmpmnt/$mdtimg ||
+               error "failed to mkfs for $tmpmnt/$mdtimg"
+
+       do_facet $SINGLEMDS $TUNE2FS -l $tmpmnt/$mdtimg |
+               grep -qw 'features.*extent' || error "extent should be enabled"
+}
+run_test 116 "big size MDT support"
+
 if ! combined_mgs_mds ; then
        stop mgs
 fi
@@ -8058,4 +8087,5 @@ OSTSIZE=$STORED_OSTSIZE
 reformat
 
 complete $SECONDS
+check_and_cleanup_lustre
 exit_status