From 8b7d850c7c966e8486b9c33539c4b1dd284dd087 Mon Sep 17 00:00:00 2001 From: George Milescu Date: Mon, 2 Aug 2010 14:54:22 +0200 Subject: [PATCH] Added a second scenario to campaign02; updated detect_complete_hrk to detect segmentation faults. Signed-off-by: George Milescu --- ConfigFiles/campaign02.html | 9 ++- ConfigFiles/campaign02.txt | 1 + ConfigFiles/scenario02ct.r | 67 ++++++++++++++++++ ConfigFiles/scenario02ct.txt | 98 +++++++++++++++++++++++++++ ControlScripts/detect_complete_hrk.sh | 4 ++ ControlScripts/run_scenario.sh | 2 +- 6 files changed, 179 insertions(+), 2 deletions(-) create mode 100644 ConfigFiles/scenario02ct.r create mode 100644 ConfigFiles/scenario02ct.txt diff --git a/ConfigFiles/campaign02.html b/ConfigFiles/campaign02.html index 7e4f55e..a396d00 100644 --- a/ConfigFiles/campaign02.html +++ b/ConfigFiles/campaign02.html @@ -117,12 +117,19 @@ - scenario-01 + scenario-01ct 1 89 8 Mbit/s up/down dlspeed vs percent; dlspeed vs time + + scenario-02ct + 89 + 1 + 8 Mbit/s up/down + dlspeed vs percent; dlspeed vs time + diff --git a/ConfigFiles/campaign02.txt b/ConfigFiles/campaign02.txt index 5bd4622..a35d076 100644 --- a/ConfigFiles/campaign02.txt +++ b/ConfigFiles/campaign02.txt @@ -4,3 +4,4 @@ # # ScenarioDescription PlotScript scenario01ct.txt scenario01ct.r +scenario02ct.txt scenario02ct.r diff --git a/ConfigFiles/scenario02ct.r b/ConfigFiles/scenario02ct.r new file mode 100644 index 0000000..f653b73 --- /dev/null +++ b/ConfigFiles/scenario02ct.r @@ -0,0 +1,67 @@ +# +# Copyright: George Milescu 2010 - george.milescu@gmail.com +# +# R script used to plot the results of a scenario + +# import ggplot2 +library(ggplot2) + +# Read transmitted command line arguments +args <- commandArgs(trailingOnly = TRUE) + +# The data files are located in the target folder. Also, the graph will be saved in the target folder. +target_folder <- args[2] +campaign_name <- args[3] +rm(args) + +# read data from the data file +leecher01=read.table(paste(target_folder, "p2p-next-01-101.log.data", sep="/"), header=T, sep=" ") + + + +# transform KB/s to Mbit/s +leecher01$dlspeed <- leecher01$dlspeed*8/1000 + + + +# plot dlspeed-percent data +p <- ggplot() + +geom_point(aes(x=leecher01$percent, y=leecher01$dlspeed, label="Leecher 01"), size=1) + +theme_bw() + +scale_x_continuous("Percent", limits=c(0, 100), breaks=seq(0, 100, 10)) + +scale_y_continuous("Download speed (Mbit/s)", limits=c(0, 8), breaks=seq(0, 8, 0.5)) + +coord_cartesian() + +scale_colour_manual("Legend") + +opts(title=paste(campaign_name, "Scenario-02ct: a seeded swarm (89 Seeders, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n")) + +# plot data as an eps file +postscript(paste(target_folder, "scenario02ct-dlspeed-percent.eps", sep="/")) +print(p) +dev.off() + +# plot data as an png file +png(paste(target_folder, "scenario02ct-dlspeed-percent.png", sep="/"), width = 1280, height = 800) +print(p) +dev.off() + + + +# plot dlspeed-time data +p <- ggplot() + +geom_point(aes(x=leecher01$time, y=leecher01$dlspeed, label="Leecher 01"), size=1) + +theme_bw() + +scale_x_continuous("Time(s)") + +scale_y_continuous("Download speed (Mbit/s)", limits=c(0, 8), breaks=seq(0, 8, 0.5)) + +coord_cartesian() + +scale_colour_manual("Legend") + +opts(title=paste(campaign_name, "Scenario-02ct: a flashcrowd swarm (89 Seeders, 1 Leecher), all peers have an 8 Mbit/s BW", sep="\n")) + +# plot data as an eps file +postscript(paste(target_folder, "scenario02ct-dlspeed-time.eps", sep="/")) +print(p) +dev.off() + +# plot data as an png file +png(paste(target_folder, "scenario02ct-dlspeed-time.png", sep="/"), width = 1280, height = 800) +print(p) +dev.off() diff --git a/ConfigFiles/scenario02ct.txt b/ConfigFiles/scenario02ct.txt new file mode 100644 index 0000000..086819a --- /dev/null +++ b/ConfigFiles/scenario02ct.txt @@ -0,0 +1,98 @@ +# Scenario01ct +# Description: +# * a seeded swarm +# * 89 seeders +# * 1 leecher +# * all peers have the same bandwidth +# +# Hostname SSHport User RemoteFolder NetInterface Download(Mbps) DownloadBurst(K) Upload(Mbps) UploadBurst(K) StartDelay(s) StartCommand StopDetector StopCommand TcScript LogParser +p2p-next-01.grid.pub.ro 10122 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_leecher.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-01.grid.pub.ro 10222 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-01.grid.pub.ro 10322 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-01.grid.pub.ro 10422 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-01.grid.pub.ro 10522 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-01.grid.pub.ro 10622 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-01.grid.pub.ro 10722 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-01.grid.pub.ro 10822 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-01.grid.pub.ro 10922 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-01.grid.pub.ro 11022 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 10122 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 10222 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 10322 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 10422 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 10522 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 10622 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 10722 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 10822 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 10922 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-03.grid.pub.ro 11022 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 10122 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 10222 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 10322 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 10422 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 10522 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 10622 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 10722 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 10822 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 10922 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-04.grid.pub.ro 11022 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 10122 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 10222 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 10322 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 10422 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 10522 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 10622 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 10722 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 10822 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 10922 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-05.grid.pub.ro 11022 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 10122 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 10222 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 10322 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 10422 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 10522 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 10622 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 10722 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 10822 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 10922 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-06.grid.pub.ro 11022 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 10122 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 10222 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 10322 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 10422 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 10522 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 10622 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 10722 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 10822 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 10922 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-07.grid.pub.ro 11022 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 10122 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 10222 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 10322 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 10422 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 10522 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 10622 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 10722 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 10822 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 10922 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-08.grid.pub.ro 11022 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 10122 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 10222 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 10322 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 10422 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 10522 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 10622 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 10722 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 10822 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 10922 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-09.grid.pub.ro 11022 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 10122 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 10222 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 10322 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 10422 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 10522 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 10622 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 10722 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 10822 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 10922 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh +p2p-next-10.grid.pub.ro 11022 p2p /home/p2p/george eth0 8 100 8 100 0 start_hrk_seeder.sh Data.700M.ct.torrent detect_complete_hrk.sh stop_hrk.sh bw_limit_ct.sh parse_hrk.sh \ No newline at end of file diff --git a/ControlScripts/detect_complete_hrk.sh b/ControlScripts/detect_complete_hrk.sh index e475752..2ae8f01 100755 --- a/ControlScripts/detect_complete_hrk.sh +++ b/ControlScripts/detect_complete_hrk.sh @@ -24,6 +24,10 @@ while true; do exit 0 fi + if cat $LOG_FILE | grep "Segmentation fault" &> /dev/null; then + exit 0 + fi + # Don't do continuous polling sleep 5 done diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh index 442502c..3a0ba36 100755 --- a/ControlScripts/run_scenario.sh +++ b/ControlScripts/run_scenario.sh @@ -92,7 +92,7 @@ scenario_setup() { echo " ** Setting-up $SERVER:$PORT" # Clean-up the host by using rsync - if ! rsync -avP --del --rsh='ssh -p'$PORT $TEST_INFRASTRUCTURE_REL_PATH ${USER}@${SERVER}:${REMOTE_PATH} &>> $ERR_LOG; then + if ! rsync -avP --del --exclude 'Results' --rsh='ssh -p'$PORT $TEST_INFRASTRUCTURE_REL_PATH ${USER}@${SERVER}:${REMOTE_PATH} &>> $ERR_LOG; then echo "Error: rsync error on $SERVER" exit 1 fi -- 2.20.1