LU-11558 tests: re-enable conf-sanity t32_verify_quota()

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index d65c75d..f6c0457 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2100,11 +2100,10 @@ t32_test() {
                shall_cleanup_lustre=true
                $r $LCTL set_param debug="$PTLDEBUG"
 
-               # Leave re-enabling this to a separate patch for LU-11558
-               # t32_verify_quota $SINGLEMDS $fsname $tmp/mnt/lustre || {
-               #       error_noexit "verify quota failed"
-               #       return 1
-               #}
+               t32_verify_quota $SINGLEMDS $fsname $tmp/mnt/lustre || {
+                       error_noexit "verify quota failed"
+                       return 1
+               }
 
                if $r test -f $tmp/list; then
                        #
@@ -8672,6 +8671,18 @@ test_120() { # LU-11130
 }
 run_test 120 "cross-target rename should not create bad symlinks"
 
+test_121(){
+       stopall
+       start_mgsmds || error "MGS MDS Start failed"
+       fail mgs
+       stop_mds || error "Stopping MDSes failed"
+       #failback
+       start_mds
+       fail mgs
+       stop_mds || error "Stopping MDSes failed"
+}
+run_test 121 "failover MGS"
+
 test_122a() {
        [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"
        [[ "$OST1_VERSION" -ge $(version_code 2.11.53) ]] ||
@@ -9029,10 +9040,7 @@ test_123F() {
        echo "Writeconf"
        writeconf_all
        echo "Remounting"
-       mountmgs
-       mountmds
-       mountoss
-       mountcli
+       setup_noconfig
 
        # Reapply the config from before
        echo "Setting configuration parameters"
@@ -9312,6 +9320,23 @@ test_128()
 }
 run_test 128 "Force using remote logs with --nolocallogs"
 
+test_129()
+{
+       stopall
+       start_mds || error "MDS start failed"
+       format_ost 1
+       start ost1 $(ostdevname 1) $OST_MOUNT_OPTS &&
+               error "start ost1 should fail" || true
+       start ost1 $(ostdevname 1) $OST_MOUNT_OPTS &&
+               error "second start ost1 should fail" || true
+       do_facet ost1 "$TUNEFS --writeconf $(ostdevname 1)"
+       start ost1 $(ostdevname 1) $OST_MOUNT_OPTS ||
+               error "start ost1 failed"
+       stop ost1
+       stop_mds
+}
+run_test 129 "attempt to connect an OST with the same index should fail"
+
 test_130()
 {
        [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs"