LU-7497 tests: Fix test failure in conf-sanity 32b

It turned out that the MGS svc was wrongly turned on in disk image
'disk2_4-zfs.tar.bz2', which caused the OST mount failure with
EALREADY because the MGS service has already been started by the MDS.

This is just a temporary solution and the final fix would be to clean
the disk image in question.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Change-Id: I912d39c08ba1437078fe7126d4498950ebeadaf1
Reviewed-on: https://review.whamcloud.com/25940
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 4bf271c..6ea18f8 100755 (executable)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1699,7 +1699,7 @@ t32_test() {
        local img_blimit
        local img_ilimit
        local fsname=t32fs
-       local nid=$($r $LCTL list_nids | head -1)
+       local nid
        local mopts
        local uuid
        local nrpcs_orig
@@ -1717,6 +1717,8 @@ t32_test() {
        trap 'trap - RETURN; t32_test_cleanup' RETURN
 
        load_modules
+       nid=$($r $LCTL list_nids | head -1)
+
        mkdir -p $tmp/mnt/lustre || error "mkdir $tmp/mnt/lustre failed"
        $r mkdir -p $tmp/mnt/{mdt,mdt1,ost}
        $r tar xjvf $tarball -S -C $tmp || {
@@ -1918,7 +1920,8 @@ t32_test() {
                        mopts="loop,$mopts"
                fi
        fi
-       $r $MOUNT_CMD -o $mopts $ost_dev $tmp/mnt/ost || {
+
+       $r $MOUNT_CMD -onomgs -o$mopts $ost_dev $tmp/mnt/ost || {
                error_noexit "Mounting the OST"
                return 1
        }