set -x
[ "$SHARED_DIRECTORY" ] || \
- { skip "$0: Empty SHARED_DIRECTORY" && exit 0; }
+ { FAIL_ON_ERROR=true skip_env "$0 Empty SHARED_DIRECTORY" && exit 0; }
+
+[ -n "$CLIENTS" ] || \
+ { FAIL_ON_ERROR=true skip_env "$0 Need two or more remote clients" && exit 0; }
-[ -n "$CLIENTS" ] || { skip "$0 Need two or more remote clients" && exit 0; }
[ $CLIENTCOUNT -ge 3 ] || \
- { skip "$0 Need two or more remote clients, have $CLIENTCOUNT" && exit 0; }
+ { FAIL_ON_ERROR=true skip_env "$0 Need two or more remote clients, have $((CLIENTCOUNT - 1))" && exit 0; }
END_RUN_FILE=${END_RUN_FILE:-$SHARED_DIRECTORY/end_run_file}
LOAD_PID_FILE=${LOAD_PID_FILE:-$TMP/client-load.pid}
check_timeout || exit 1
+[[ $FAILURE_MODE = SOFT ]] && \
+ log "WARNING: $0 is not functional with FAILURE_MODE = SOFT, bz22797"
+
build_test_filter
check_and_setup_lustre
# MDS, OST item contains the facet
case $nodetype in
MDS|OST ) facet_failover $item
- [ "$SERIAL" ] && wait_recovery_complete $item $((timeout * 4)) || true
+ [ "$SERIAL" ] && wait_recovery_complete $item || 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"
# 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