b=21968 conf-sanity changes for config mgs and mds are not combined

i=Nathan.Rutman

includes t-f:combined_mgs_mds ()

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 2b67c34..a5ae526 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -52,9 +52,9 @@ writeconf() {
        stop ${facet} -f
        rm -f ${facet}active
        # who knows if/where $TUNEFS is installed?  Better reformat if it fails...
-       do_facet ${facet} "$TUNEFS --writeconf $MDSDEV" || echo "tunefs failed, reformatting instead" && reformat
+       do_facet ${facet} "$TUNEFS --writeconf $MDSDEV" ||
+               echo "tunefs failed, reformatting instead" && reformat_and_config
 
-       gen_config
 }
 
 gen_config() {
@@ -69,9 +69,17 @@ gen_config() {
 
 reformat_and_config() {
        reformat
+       if ! combined_mgs_mds ; then
+               start_mgs
+       fi
        gen_config
 }
 
+start_mgs () {
+       echo "start mgs"
+       start mgs $MGSDEV $mgs_MOUNT_OPTS
+}
+
 start_mds() {
        echo "start mds service on `facet_active_host mds`"
        start mds $MDSDEV $MDS_MOUNT_OPTS || return 94
@@ -153,6 +161,10 @@ setup() {
 }
 
 setup_noconfig() {
+       if ! combined_mgs_mds ; then
+               start_mgs
+       fi
+
        start_mds
        start_ost
        mount_client $MOUNT
@@ -644,7 +656,7 @@ test_23a() {        # was test_23
        local PID1
        local PID2
        local WAIT=0
-       local MAX_WAIT=20
+       local MAX_WAIT=30
        local sleep=1
        while [ "$WAIT" -lt "$MAX_WAIT" ]; do
                sleep $sleep
@@ -656,9 +668,11 @@ test_23a() {       # was test_23
                echo "waiting for mount to finish ... "
                WAIT=$(( WAIT + sleep))
        done
-       [ "$WAIT" -eq "$MAX_WAIT" ] && error "MOUNT_PID $MOUNT_PID and \
+       if [ "$WAIT" -eq "$MAX_WAIT" ]; then
+               error "MOUNT_PID $MOUNT_PID and \
                MOUNT__LUSTRE_PID $MOUNT__LUSTRE_PID still not killed in $WAIT secs"
-       ps -ef | grep mount
+               ps -ef | grep mount
+       fi
        stop_mds || error
        stop_ost || error
 }
@@ -1603,7 +1617,7 @@ cleanup_46a() {
 
 test_46a() {
        echo "Testing with $OSTCOUNT OSTs"
-       reformat
+       reformat_and_config
        start_mds || return 1
        #first client should see only one ost
        start_ost || return 2
@@ -1718,9 +1732,7 @@ test_49() { # bug 17710
        OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$LOCAL_TIMEOUT --param sys.ldlm_timeout=$LOCAL_TIMEOUT $MKFSOPT $OSTOPT"
 
        reformat
-       start_mds
-       start_ost
-       mount_client $MOUNT
+       setup_noconfig
        check_mount || return 1
 
        echo "check ldlm_timout..."
@@ -1743,9 +1755,7 @@ test_49() { # bug 17710
        OST_MKFS_OPTS="--ost --fsname=$FSNAME --device-size=$OSTSIZE --mgsnode=$MGSNID --param sys.timeout=$LOCAL_TIMEOUT --param sys.ldlm_timeout=$((LOCAL_TIMEOUT - 1)) $MKFSOPT $OSTOPT"
 
        reformat
-       start_mds || return 4
-       start_ost || return 5
-       mount_client $MOUNT || return 6
+       setup_noconfig
        check_mount || return 7
 
        LDLM_MDS="`do_facet mds lctl get_param -n ldlm_timeout`"
@@ -1963,5 +1973,9 @@ test_50g() {
 }
 run_test 50g "deactivated OST should not cause panic====================="
 
+if ! combined_mgs_mds ; then
+       stop mgs
+fi
+
 equals_msg `basename $0`: test complete
 [ -f "$TESTSUITELOG" ] && cat $TESTSUITELOG && grep -q FAIL $TESTSUITELOG && exit 1 || true

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 76b29d8..afaa5c5 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1409,7 +1409,7 @@ stopall() {
         stop ost$num -f
         rm -f $TMP/ost${num}active
     done
-    if [[ $MDSDEV != $MGSDEV ]]; then
+    if ! combined_mgs_mds ; then
         stop mgs 
     fi
 
@@ -1423,6 +1423,10 @@ cleanupall() {
     unload_modules
 }
 
+combined_mgs_mds () {
+    [[ $MDSDEV = $MGSDEV ]] && [[ $mds_HOST = $mgs_HOST ]]
+}
+
 formatall() {
     [ "$FSTYPE" ] && FSTYPE_OPT="--backfstype $FSTYPE"
 
@@ -1431,7 +1435,7 @@ formatall() {
     load_modules
     [ "$CLIENTONLY" ] && return
     echo Formatting mgs, mds, osts
-    if [[ $MDSDEV != $MGSDEV ]] || [[ $mds_HOST != $mgs_HOST ]]; then
+    if ! combined_mgs_mds ; then
         add mgs $mgs_MKFS_OPTS $FSTYPE_OPT --reformat $MGSDEV || exit 10
     fi
 
@@ -1489,7 +1493,7 @@ setupall() {
         echo $WRITECONF | grep -q "writeconf" && \
             writeconf_all
 
-        if [[ $mds_HOST != $mgs_HOST ]] || [[ $MDSDEV != $MGSDEV ]]; then
+        if ! combined_mgs_mds ; then
             start mgs $MGSDEV $mgs_MOUNT_OPTS
         fi