Correctly set lsm size for open replay.

[fs/lustre-release.git] / lustre / tests / test-framework.sh

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index c6eb2c2..0d09af4 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -180,7 +180,6 @@ init_test_env() {
 
     [ "$TESTSUITELOG" ] && rm -f $TESTSUITELOG || true
     rm -f $TMP/*active
-
 }
 
 case `uname -r` in
@@ -682,7 +681,7 @@ sanity_mount_check_servers () {
     echo Checking servers environments
 
     # FIXME: modify get_facets to display all facets wo params
-    local facets="$(get_facets OST),$(get_facets MDS)"
+    local facets="$(get_facets OST),$(get_facets MDS),mgs"
     local node
     local mnt
     local facet
@@ -824,6 +823,7 @@ boot_node() {
     local node=$1
     if [ "$FAILURE_MODE" = HARD ]; then
        $POWER_UP $node
+       wait_for_host $node
     fi
 }
 
@@ -953,9 +953,10 @@ restart_client_loads () {
         check_client_load $client
         rc=${PIPESTATUS[0]}
         if [ "$rc" != 0 -a "$expectedfail" ]; then
-            start_client_load $client
-            echo "Restarted client load: on $client. Checking ..."
-            check_client_load $client 
+            local var=$(client_var_name $client)_load
+            start_client_load $client ${!var}
+            echo "Restarted client load ${!var}: on $client. Checking ..."
+            check_client_load $client
             rc=${PIPESTATUS[0]}
             if [ "$rc" != 0 ]; then
                 log "Client load failed to restart on node $client, rc=$rc"
@@ -1044,7 +1045,7 @@ wait_delete_completed () {
 wait_for_host() {
     local host=$1
     check_network "$host" 900
-    while ! do_node $host "ls -d $LUSTRE " > /dev/null; do sleep 5; done
+    while ! do_node $host hostname  > /dev/null; do sleep 5; done
 }
 
 wait_for() {
@@ -1407,7 +1408,11 @@ do_nodes() {
     shift
 
     if $(single_local_node $rnodes); then
-        do_node --verbose $rnodes $@
+        if $verbose; then
+           do_node --verbose $rnodes $@
+        else
+           do_node $rnodes $@
+        fi
         return $?
     fi
 
@@ -1529,7 +1534,11 @@ formatall() {
     # We need ldiskfs here, may as well load them all
     load_modules
     [ "$CLIENTONLY" ] && return
-    echo "Formatting mdts, osts"
+    echo Formatting mgs, mds, osts
+    if [[ $MDSDEV1 != $MGSDEV ]] || [[ $mds1_HOST != $mgs_HOST ]]; then
+        add mgs $mgs_MKFS_OPTS $FSTYPE_OPT --reformat $MGSDEV || exit 10
+    fi
+
     for num in `seq $MDSCOUNT`; do
         echo "Format mds$num: $(mdsdevname $num)"
         if $VERBOSE; then
@@ -1622,9 +1631,13 @@ setupall() {
     load_modules
     init_gss
     if [ -z "$CLIENTONLY" ]; then
-        echo "Setup mdts, osts"
+        echo Setup mgs, mdt, osts
         echo $WRITECONF | grep -q "writeconf" && \
             writeconf_all
+        if [[ $mds1_HOST != $mgs_HOST ]] || [[ $MDSDEV1 != $MGSDEV ]]; then
+            start mgs $MGSDEV $mgs_MOUNT_OPTS
+        fi
+
         for num in `seq $MDSCOUNT`; do
             DEVNAME=$(mdsdevname $num)
             start mds$num $DEVNAME $MDS_MOUNT_OPTS
@@ -1833,10 +1846,10 @@ check_config () {
     local mgshost=$(mount | grep " $mntpt " | awk -F@ '{print $1}')
     mgshost=$(echo $mgshost | awk -F: '{print $1}')
 
-    if [ "$mgshost" != "$myMGS_host" ]; then
-            error_exit "Bad config file: lustre is mounted with mgs $mgshost, but mgs_HOST=$mgs_HOST, NETTYPE=$NETTYPE
-                   Please use correct config or set mds_HOST correctly!"
-    fi
+#    if [ "$mgshost" != "$myMGS_host" ]; then
+#            error_exit "Bad config file: lustre is mounted with mgs $mgshost, but mgs_HOST=$mgs_HOST, NETTYPE=$NETTYPE
+#                   Please use correct config or set mds_HOST correctly!"
+#    fi
 
     sanity_mount_check ||
         error "environments are insane!"
@@ -1906,8 +1919,7 @@ check_network() {
     local WAIT=0
     local MAX=$2
     while [ $NETWORK -eq 0 ]; do
-        ping -c 1 -w 3 $1 > /dev/null
-        if [ $? -eq 0 ]; then
+        if ping -c 1 -w 3 $1 > /dev/null; then
             NETWORK=1
         else
             WAIT=$((WAIT + 5))
@@ -2135,6 +2147,10 @@ pgcache_empty() {
             return 1
         fi
     done
+    if [[ $MDSDEV1 != $MGSDEV ]]; then
+        stop mgs 
+    fi
+
     return 0
 }
 
@@ -2211,12 +2227,8 @@ build_test_filter() {
        done
 }
 
-_basetest() {
-    echo $*
-}
-
 basetest() {
-    IFS=abcdefghijklmnopqrstuvwxyz _basetest $1
+    echo ${1%%[a-z]*}
 }
 
 # print a newline if the last test was skipped