ControlScripts: add process terminate functionality in run_scenario.sh in scenario_se...
authorP2P-Next User <p2p@p2p-next-04-201.grid.pub.ro>
Fri, 20 Aug 2010 13:35:39 +0000 (16:35 +0300)
committerP2P-Next User <p2p@p2p-next-04-201.grid.pub.ro>
Fri, 20 Aug 2010 13:35:39 +0000 (16:35 +0300)
ControlScripts/run_scenario.sh

index 46c84f0..409fd29 100755 (executable)
@@ -100,6 +100,12 @@ 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
+
                # 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
                        echo "Error: rsync error on $SERVER"