LU-8474 tests: stop MGS before setup_noconfig in conf-sanity.sh

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

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 89a945b..c64ebab 100755 (executable)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2810,7 +2810,8 @@ test_41a() { #bug 14134
                return
        fi
 
-       local MDSDEV=$(mdsdevname ${SINGLEMDS//mds/})
+       combined_mgs_mds ||
+               { skip "needs combined MGT and MDT device" && return 0; }
 
        start_mdt 1 -o nosvc -n
        if [ $MDSCOUNT -ge 2 ]; then
@@ -4047,6 +4048,10 @@ test_55() {
 
        for i in 1023 2048
        do
+               if ! combined_mgs_mds; then
+                       stop_mgs || error "stopping MGS service failed"
+                       format_mgs || error "formatting MGT failed"
+               fi
                add mds1 $(mkfs_opts mds1 ${mdsdev}) --reformat $mdsdev \
                        $mdsvdev || exit 10
                add ost1 $(mkfs_opts ost1 $(ostdevname 1)) --index=$i \
@@ -4143,6 +4148,7 @@ count_osts() {
 }
 
 test_58() { # bug 22658
+       combined_mgs_mds || stop_mgs || error "stopping MGS service failed"
        setup_noconfig
        mkdir $DIR/$tdir || error "mkdir $DIR/$tdir failed"
        createmany -o $DIR/$tdir/$tfile-%d 100
@@ -4246,6 +4252,7 @@ test_61() { # LU-80
                done
        fi
 
+       combined_mgs_mds || stop_mgs || error "stopping MGS service failed"
        setup_noconfig || error "setting up the filesystem failed"
        client_up || error "starting client failed"