From 1c397c6f22cf10c6fbb03ebb8694afe992743589 Mon Sep 17 00:00:00 2001 From: P2P-Next User Date: Fri, 20 Aug 2010 16:47:24 +0300 Subject: [PATCH] ControlScripts: ignore ssh command output when terminating user owned process --- ControlScripts/run_scenario.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh index 409fd29..b4b095e 100755 --- a/ControlScripts/run_scenario.sh +++ b/ControlScripts/run_scenario.sh @@ -100,11 +100,8 @@ scenario_setup() { while IFS=$'\t' read SERVER PORT USER REMOTE_PATH REMOTE_IF DL_BW DL_BURST UL_BW UL_BURST NO_CONNECTIONS PRE_RUN_SCRIPT POST_RUN_SCRIPT CLIENT_TYPE TORRENT_FILE PERIODS; do echo " ** Setting-up $SERVER:$PORT" - # Terminate $USER owned processes - if ! ssh -n -p ${PORT} root@${SERVER} "pkill -u ${USER}; pkill -KILL -u ${USER}"; then - echo "Error: cannot kill $USER owned processes" - exit 1 - fi + # Terminate $USER owned processes (ignore result) + ssh -n -p ${PORT} root@${SERVER} "pkill -u ${USER}; pkill -KILL -u ${USER}" # Clean-up the host by using rsync if ! rsync -avP --del --exclude 'Results' --rsh='ssh -p'$PORT $TEST_INFRASTRUCTURE_REL_PATH ${USER}@${SERVER}:${REMOTE_PATH} >> $ERR_LOG 2>&1; then -- 2.20.1