From: Razvan Deaconescu <razvan.deaconescu@cs.pub.ro>
Date: Sun, 24 Oct 2010 15:44:09 +0000 (+0300)
Subject: test-socket-signal: working version for command_test
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=b0a28b5ffce682d08de0970d772fc73eba07f4a0;p=p2p-testing-infrastructure.git

test-socket-signal: working version for command_test
---

diff --git a/Utils/test-socket-signal/test/command_test b/Utils/test-socket-signal/test/command_test
index a682e73..c78a31a 100755
--- a/Utils/test-socket-signal/test/command_test
+++ b/Utils/test-socket-signal/test/command_test
@@ -12,6 +12,15 @@ experiment_type="$1"
 hostname1="$2"
 hostname2="$3"
 
+# global variables
+leader_port=12345
+leader_buffer_size=1024
+leader_frequency=1
+follower_port=54321
+follower_buffer_size=128
+follower_frequency=10
+
+
 DEBUG()
 {
 	test "$_DEBUG" = "on" && $@
@@ -53,11 +62,11 @@ run_remote()
 	remote_port="$8"
 	remote_buffer_size="$9"
 
-	ssh -n -p $port p2p@$host "nohup /home/p2p/signal-socket/local_run_$experiment_type $client_type $listen_port $buffer_size $frequency $remote_ip $remote_port $remote_buffer_size &"
+	set -x
+	ssh -n -f -p $port p2p@$host "cd /home/p2p/test-socket-signal/test && nohup ./local_run_$experiment_type $client_type $listen_port $buffer_size $frequency $remote_ip $remote_port $remote_buffer_size > err.log 2>&1 &"
+	set +x
 }
 
-# TODO: rsync
-
 base_host1=${hostname1%-*}.grid.pub.ro
 base_host2=${hostname2%-*}.grid.pub.ro
 ssh_port1=${hostname1##*-}22
@@ -66,13 +75,22 @@ ssh_port2=${hostname2##*-}22
 DEBUG echo "host1: p2p@$base_host1:$ssh_port1"
 DEBUG echo "host2: p2p@$base_host2:$ssh_port2"
 
+echo "syncing p2p@$base_host1:$ssh_port1"
+rsync -avz --delete-after -e "ssh -p $ssh_port1" ../../test-socket-signal p2p@$base_host1:
+echo "syncing p2p@$base_host2:$ssh_port2"
+rsync -avz --delete-after -e "ssh -p $ssh_port2" ../../test-socket-signal p2p@$base_host2:
+
+# cleanup
+ssh -n -f -p $ssh_port1 p2p@$base_host1 "pkill peer"
+ssh -n -f -p $ssh_port2 p2p@$base_host2 "pkill peer"
+
 leader_ip=$(hostname_to_veth_ip $hostname1)
 follower_ip=$(hostname_to_veth_ip $hostname2)
 
 DEBUG echo "leader_ip = $leader_ip"
 DEBUG echo "follower_ip = $follower_ip"
 
-DEBUG echo "running remote leader ..."
+echo "running remote leader ..."
 run_remote $base_host1 $ssh_port1 "leader" $leader_port $leader_buffer_size $leader_frequency $follower_ip $follower_port $follower_buffer_size
-DEBUG echo "running remote follower ..."
+echo "running remote follower ..."
 run_remote $base_host2 $ssh_port2 "follower" $follower_port $follower_buffer_size $follower_frequency $leader_ip $leader_port $leader_buffer_size