LU-5706 tests: Ensure preconditions in conf-sanity/57

The modules need to be loaded to read any data, but the system does
not need to be mounted.  Loading modules prevents any skipped tests
causing this one to fail.

Test-Parameters: mdsfilesystemtype=zfs mdtfilesystemtype=zfs ostfilesystemtype=zfs testlist=conf-sanity envdefinitions="CONF_SANITY_EXCEPT=56"
Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: Idf7003067c6ea9f33203f219f5b370008a43fafd
Reviewed-on: http://review.whamcloud.com/12236
Tested-by: Jenkins
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 2414f81..101ffee 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -232,11 +232,7 @@ setup() {
 }
 
 setup_noconfig() {
-       if ! combined_mgs_mds ; then
-               start_mgs
-       fi
-
-       start_mds
+       start_mgsmds
        start_ost
        mount_client $MOUNT
 }
@@ -3701,6 +3697,7 @@ test_56() {
 run_test 56 "check big OST indexes and out-of-index-order start"
 
 test_57a() { # bug 22656
+       do_rpc_nodes $(facet_active_host ost1) load_modules_local
        local NID=$(do_facet ost1 "$LCTL get_param nis" | tail -1 | awk '{print $1}')
        writeconf_or_reformat
        [ $(facet_fstype ost1) == zfs ] && import_zpool ost1
@@ -3712,6 +3709,7 @@ test_57a() { # bug 22656
 run_test 57a "initial registration from failnode should fail (should return errs)"
 
 test_57b() {
+       do_rpc_nodes $(facet_active_host ost1) load_modules_local
        local NID=$(do_facet ost1 "$LCTL get_param nis" | tail -1 | awk '{print $1}')
        writeconf_or_reformat
        [ $(facet_fstype ost1) == zfs ] && import_zpool ost1