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 a63ff9f..9149940 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -4646,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"
@@ -4701,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
@@ -6169,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; }