b=21825 doxygen comments for CMM

[fs/lustre-release.git] / lustre / tests / recovery-double-scale.sh

diff --git a/lustre/tests/recovery-double-scale.sh b/lustre/tests/recovery-double-scale.sh
index 1f84f92..f88afae 100644 (file)
--- a/lustre/tests/recovery-double-scale.sh
+++ b/lustre/tests/recovery-double-scale.sh
@@ -17,6 +17,7 @@ CLEANUP=${CLEANUP:-""}
 init_test_env $@
 
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
+init_logging
 TESTSUITELOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh)}
 DEBUGLOG=$TESTSUITELOG.debug
 
@@ -76,6 +77,9 @@ reboot_recover_node () {
                 [ "$SERIAL" ] && wait_recovery_complete $item $((timeout * 4)) || true
                 ;;
        clients) for c in ${item//,/ }; do
+                      # make sure the client loads die
+                      do_nodes $c "set -x; test -f $TMP/client-load.pid && \
+                             { kill -s TERM \$(cat $TMP/client-load.pid) || true; }"
                       shutdown_client $c
                       boot_node $c
                       echo "Reintegrating $c"
@@ -266,12 +270,8 @@ FAILOVER_PERIOD=${FAILOVER_PERIOD:-$((60*5))} # 5 minutes
 # Start client loads.
 start_client_loads $NODES_TO_USE
 echo clients load pids:
-if ! do_nodes $NODES_TO_USE "set -x; echo \$(hostname): && cat $TMP/client-load.pid"; then
-    if [ -e $DEBUGLOG ]; then
-        exec 2<&-
-        cat $DEBUGLOG
+if ! do_nodesv $NODES_TO_USE "cat $TMP/client-load.pid"; then
         exit 3
-    fi
 fi
 
 # FIXME: Do we want to have an initial sleep period where the clients