LU-424 tests: conf-sanity test 55, 56, 58 failure fixes

The MGS service was not started in conf-sanity test 55, 56 and 58
with separate MGS and MDT configuration. This patch fix the issue.

Signed-off-by: Yu Jian <yujian@whamcloud.com>
Change-Id: Id82121f645d1903934bcf00328627947e943c45c
Reviewed-on: http://review.whamcloud.com/955
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Bobi Jam <bobijam@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Johann Lombardi <johann@whamcloud.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index c32da7f..15912dc 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2267,7 +2267,7 @@ test_55() {
                cp /etc/passwd $DIR/1
                stopall
 
-               setup
+               setup_noconfig
                cp /etc/passwd $DIR/2
                sync
 
@@ -2297,7 +2297,7 @@ test_56() {
        add ost2 $OST_MKFS_OPTS --index=10000 --reformat $(ostdevname 2) || \
                error "failed to reformat ost2"
 
-       start_mds
+       start_mgsmds
        start_ost
        start_ost2 || error "Unable to start second ost"
        mount_client $MOUNT || error "Unable to mount client"
@@ -2331,7 +2331,7 @@ run_test 57b "initial registration from servicenode should not fail"
 
 test_58() { # bug 22658
         [ "$FSTYPE" != "ldiskfs" ] && skip "not supported for $FSTYPE" && return
-       setup
+       setup_noconfig
        mkdir -p $DIR/$tdir
        createmany -o $DIR/$tdir/$tfile-%d 100
        # make sure that OSTs do not cancel llog cookies before we unmount the MDS