b=22296 Fix script problem for recovery-double-scale

Force the test threads stopped before shutdown the clients in
recovery-double-scale.

i=Jack.Chen
i=WangDi

diff --git a/lustre/tests/recovery-double-scale.sh b/lustre/tests/recovery-double-scale.sh
index 73d96f9..f88afae 100644 (file)
--- a/lustre/tests/recovery-double-scale.sh
+++ b/lustre/tests/recovery-double-scale.sh
@@ -77,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"