From ed10d733ccfc6c5a4c10b7a24fb4370f45e2d43d Mon Sep 17 00:00:00 2001 From: George Milescu Date: Wed, 7 Sep 2011 23:12:20 +0300 Subject: [PATCH] Merges George changes Signed-off-by: George Milescu --- .../clients/tribler/start_tribler_doe.sh | 2 +- .../clients/tribler/start_tribler_leecher.sh | 2 +- .../clients/tribler/start_tribler_proxy.sh | 34 ++++++++++++------- Utils/cssh_cluster.sh | 2 +- Utils/start_tribler_gui.sh | 5 +-- Utils/sync_cluster.sh | 5 ++- Utils/sync_cluster_containers.sh | 5 +-- Utils/sync_das2.sh | 5 +-- Utils/sync_ixlabs.cs.pub.ro.sh | 2 +- Utils/sync_kth.sh | 2 +- .../sync_single_cluster_container_scripts.sh | 4 +-- Utils/sync_vm.sh | 14 ++++---- 12 files changed, 47 insertions(+), 35 deletions(-) diff --git a/ControlScripts/clients/tribler/start_tribler_doe.sh b/ControlScripts/clients/tribler/start_tribler_doe.sh index 5c2bbd0..cc8ce14 100755 --- a/ControlScripts/clients/tribler/start_tribler_doe.sh +++ b/ControlScripts/clients/tribler/start_tribler_doe.sh @@ -35,6 +35,6 @@ export PYTHONPATH=$PYTHONPATH:. cd $TRIBLER_REL_PATH -python2.6 Tribler/Tools/proxy-cmdline.py --proxymode private --test-mode coord --state-dir $WORKING_FOLDER_REL_PATH/Doe/statedir --output-dir $WORKING_FOLDER_REL_PATH/Doe/ $WORKING_FOLDER_REL_PATH/TorrentsAndData/$TORRENT_FILE +python2.6 Tribler/Tools/proxy-cmdline.py --proxyservice off --doemode private --test-mode doe --state-dir $WORKING_FOLDER_REL_PATH/Doe/statedir --output-dir $WORKING_FOLDER_REL_PATH/Doe/ $WORKING_FOLDER_REL_PATH/TorrentsAndData/$TORRENT_FILE rm -rf $WORKING_FOLDER_REL_PATH/Doe/* diff --git a/ControlScripts/clients/tribler/start_tribler_leecher.sh b/ControlScripts/clients/tribler/start_tribler_leecher.sh index 36bcd05..397f2e7 100755 --- a/ControlScripts/clients/tribler/start_tribler_leecher.sh +++ b/ControlScripts/clients/tribler/start_tribler_leecher.sh @@ -35,6 +35,6 @@ export PYTHONPATH=$PYTHONPATH:. cd $TRIBLER_REL_PATH -python2.6 Tribler/Tools/proxy-cmdline.py --proxymode off --test-mode off --port 25124 --state-dir $WORKING_FOLDER_REL_PATH/Regular/statedir --output-dir $WORKING_FOLDER_REL_PATH/Regular/ $WORKING_FOLDER_REL_PATH/TorrentsAndData/$TORRENT_FILE +python2.6 Tribler/Tools/proxy-cmdline.py --proxyservice off --test-mode off --port 25124 --state-dir $WORKING_FOLDER_REL_PATH/Regular/statedir --output-dir $WORKING_FOLDER_REL_PATH/Regular/ $WORKING_FOLDER_REL_PATH/TorrentsAndData/$TORRENT_FILE rm -rf $WORKING_FOLDER_REL_PATH/Regular/* diff --git a/ControlScripts/clients/tribler/start_tribler_proxy.sh b/ControlScripts/clients/tribler/start_tribler_proxy.sh index 89af2bf..20bf024 100755 --- a/ControlScripts/clients/tribler/start_tribler_proxy.sh +++ b/ControlScripts/clients/tribler/start_tribler_proxy.sh @@ -9,13 +9,13 @@ # * at the end deletes the state directory # # Script arguments: -# * proxy number [1-4] +# * proxy number [1-4] (optional) # # If you run this script manually, you must run it from the P2P-Testing-Infrastructure/ControlScripts folder and use one argument: the the proxy number # -if [ ! $# -eq 1 ]; then - echo "usage: $0 proxy-no" +if [ $# -ge 2 ]; then + echo "usage: $0 [proxy-no]" exit 1 fi @@ -35,13 +35,23 @@ else source ../ClientWorkingFolders/TmpLogs/node_config fi -# Read arguments -PROXY_NO=$1 - -export PYTHONPATH=$PYTHONPATH:. - -cd $TRIBLER_REL_PATH - -python2.6 Tribler/Tools/proxy-cmdline.py --proxymode off --proxyservice on --port 25123 --test-mode helper --state-dir $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/statedir --no-download +if $# -eq 1; then + # Read arguments + PROXY_NO=$1 + + export PYTHONPATH=$PYTHONPATH:. + + cd $TRIBLER_REL_PATH + + python2.6 Tribler/Tools/proxy-cmdline.py --proxyservice on --doemode off --test-mode proxy --port 25123 --state-dir $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/statedir --no-download + + rm -rf $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/* +else + export PYTHONPATH=$PYTHONPATH:. + + cd $TRIBLER_REL_PATH + + python2.6 Tribler/Tools/proxy-cmdline.py --proxyservice on --doemode off --test-mode proxy --port 25123 --no-download -rm -rf $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/* + rm -rf $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/* +fi diff --git a/Utils/cssh_cluster.sh b/Utils/cssh_cluster.sh index 6a3459d..4af14c4 100755 --- a/Utils/cssh_cluster.sh +++ b/Utils/cssh_cluster.sh @@ -17,4 +17,4 @@ fi REMOTE_USER=$1 -cssh --term-args "-geometry 78x19" $REMOTE_USER@p2p-next-01.grid.pub.ro $REMOTE_USER@p2p-next-03.grid.pub.ro $REMOTE_USER@p2p-next-04.grid.pub.ro $REMOTE_USER@p2p-next-05.grid.pub.ro $REMOTE_USER@p2p-next-06.grid.pub.ro $REMOTE_USER@p2p-next-07.grid.pub.ro $REMOTE_USER@p2p-next-08.grid.pub.ro $REMOTE_USER@p2p-next-09.grid.pub.ro $REMOTE_USER@p2p-next-10.grid.pub.ro +cssh --term-args "-geometry 78x19" $REMOTE_USER@p2p-next-01.grid.pub.ro $REMOTE_USER@p2p-next-02.grid.pub.ro $REMOTE_USER@p2p-next-03.grid.pub.ro $REMOTE_USER@p2p-next-04.grid.pub.ro $REMOTE_USER@p2p-next-05.grid.pub.ro $REMOTE_USER@p2p-next-06.grid.pub.ro $REMOTE_USER@p2p-next-07.grid.pub.ro $REMOTE_USER@p2p-next-08.grid.pub.ro $REMOTE_USER@p2p-next-09.grid.pub.ro $REMOTE_USER@p2p-next-10.grid.pub.ro diff --git a/Utils/start_tribler_gui.sh b/Utils/start_tribler_gui.sh index 2cc4155..b2025c5 100755 --- a/Utils/start_tribler_gui.sh +++ b/Utils/start_tribler_gui.sh @@ -10,9 +10,9 @@ # Read the global configuration file # Check if the global configuration file exists if [ ! -e ../ControlScripts/globalconfig ]; then - echo "Warning: The global config file ../ControlScripts/globalconfig does not exist." + echo "Warning: The global config file ../ControlScripts/globalconfig does not exist." else - source ../ControlScripts/globalconfig + source ../ControlScripts/globalconfig fi export PYTHONPATH=$PYTHONPATH:. @@ -20,3 +20,4 @@ export PYTHONPATH=$PYTHONPATH:. cd $TRIBLER_UTIL_REL_PATH python2.6 Tribler/Main/tribler.py + diff --git a/Utils/sync_cluster.sh b/Utils/sync_cluster.sh index 143f754..884b4ee 100755 --- a/Utils/sync_cluster.sh +++ b/Utils/sync_cluster.sh @@ -22,11 +22,11 @@ fi sync_cluster_host() { remote_system=$1 echo "Syncing $remote_system" - rsync -avP --del $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure p2p@${remote_system}:/home/p2p/george/P2P-Next/ + xterm -e "rsync -avP --del $P2P_NEXT_REL_PATH/ p2p@${remote_system}:/home/ve/george/P2P-Next/" & } if [ $# -eq 0 ]; then - for host in p2p-next-01.grid.pub.ro p2p-next-03.grid.pub.ro p2p-next-04.grid.pub.ro p2p-next-05.grid.pub.ro p2p-next-06.grid.pub.ro p2p-next-07.grid.pub.ro p2p-next-08.grid.pub.ro p2p-next-09.grid.pub.ro p2p-next-10.grid.pub.ro; do + for host in p2p-next-01.grid.pub.ro p2p-next-02.grid.pub.ro p2p-next-03.grid.pub.ro p2p-next-04.grid.pub.ro p2p-next-05.grid.pub.ro p2p-next-06.grid.pub.ro p2p-next-07.grid.pub.ro p2p-next-08.grid.pub.ro p2p-next-09.grid.pub.ro p2p-next-10.grid.pub.ro; do sync_cluster_host $host done else @@ -34,4 +34,3 @@ else fi - diff --git a/Utils/sync_cluster_containers.sh b/Utils/sync_cluster_containers.sh index a55b69f..4b83329 100755 --- a/Utils/sync_cluster_containers.sh +++ b/Utils/sync_cluster_containers.sh @@ -16,7 +16,7 @@ sync_cluster_container() { host=$1 port=$2 echo "Syncing $host $port" - rsync -avP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure p2p@$host:/home/p2p/george/ > /dev/null + rsync -avzP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure p2p@$host:/home/p2p/george/ > /dev/null } if [ $# -gt 2 ]; then @@ -34,4 +34,5 @@ if [ $# -eq 0 ]; then done else sync_cluster_container $host $port -fi \ No newline at end of file +fi + diff --git a/Utils/sync_das2.sh b/Utils/sync_das2.sh index a873527..4b578c9 100755 --- a/Utils/sync_das2.sh +++ b/Utils/sync_das2.sh @@ -15,7 +15,7 @@ fi sync_das2_host() { remote_system=$1 echo "Syncing $remote_system" - rsync -avP --del $P2P_NEXT_REL_PATH gmilescu@${remote_system}:/home/gmilescu/P2P-Next + rsync -avzP --del $P2P_NEXT_REL_PATH gmilescu@${remote_system}:/home/gmilescu/P2P-Next } if [ $# -gt 1 ]; then @@ -31,4 +31,5 @@ if [ $# -eq 0 ]; then done else sync_das2_host $1 -fi \ No newline at end of file +fi + diff --git a/Utils/sync_ixlabs.cs.pub.ro.sh b/Utils/sync_ixlabs.cs.pub.ro.sh index 07a905b..6b73554 100755 --- a/Utils/sync_ixlabs.cs.pub.ro.sh +++ b/Utils/sync_ixlabs.cs.pub.ro.sh @@ -11,4 +11,4 @@ else source ../ControlScripts/globalconfig fi -rsync -avP --del $P2P_NEXT_REL_PATH george@ixlabs.cs.pub.ro:/home/george/P2P-Next +rsync -avzP --del $P2P_NEXT_REL_PATH george@ixlabs.cs.pub.ro:/home/george/P2P-Next diff --git a/Utils/sync_kth.sh b/Utils/sync_kth.sh index b134e23..9443190 100755 --- a/Utils/sync_kth.sh +++ b/Utils/sync_kth.sh @@ -11,4 +11,4 @@ else source ../ControlScripts/globalconfig fi -rsync -avP --del $P2P_NEXT_REL_PATH george@p2p-next.xen.ssvl.kth.se:/home/george/P2P-Next +rsync -avzP --del $P2P_NEXT_REL_PATH george@p2p-next.xen.ssvl.kth.se:/home/george/P2P-Next diff --git a/Utils/sync_single_cluster_container_scripts.sh b/Utils/sync_single_cluster_container_scripts.sh index cfa7d6a..8a9c7ee 100755 --- a/Utils/sync_single_cluster_container_scripts.sh +++ b/Utils/sync_single_cluster_container_scripts.sh @@ -20,5 +20,5 @@ host=$1 port=$2 echo "Syncing $host $port" -rsync -avP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure/ControlScripts p2p@$host:/home/p2p/george/P2P-Testing-Infrastructure/ > /dev/null -rsync -avP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure/TestSpecs p2p@$host:/home/p2p/george/P2P-Testing-Infrastructure/ > /dev/null +rsync -avzP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure/ControlScripts p2p@$host:/home/p2p/george/P2P-Testing-Infrastructure/ > /dev/null +rsync -avzP --del --rsh='ssh -p'$port $P2P_NEXT_REL_PATH/P2P-Testing-Infrastructure/TestSpecs p2p@$host:/home/p2p/george/P2P-Testing-Infrastructure/ > /dev/null diff --git a/Utils/sync_vm.sh b/Utils/sync_vm.sh index 61fb14b..25e593c 100755 --- a/Utils/sync_vm.sh +++ b/Utils/sync_vm.sh @@ -11,10 +11,10 @@ else source ../ControlScripts/globalconfig fi -rsync -avP --del $P2P_NEXT_REL_PATH george@tracker.local:/home/george/P2P-Next -rsync -avP --del $P2P_NEXT_REL_PATH george@coordinator.local:/home/george/P2P-Next -rsync -avP --del $P2P_NEXT_REL_PATH george@helper1.local:/home/george/P2P-Next -rsync -avP --del $P2P_NEXT_REL_PATH george@helper2.local:/home/george/P2P-Next -rsync -avP --del $P2P_NEXT_REL_PATH george@seeder1.local:/home/george/P2P-Next -rsync -avP --del $P2P_NEXT_REL_PATH george@seeder2.local:/home/george/P2P-Next -rsync -avP --del $P2P_NEXT_REL_PATH george@seeder3.local:/home/george/P2P-Next +rsync -avzP --del --exclude="*90sLogs*" $P2P_NEXT_REL_PATH george@tracker.local:/home/george/P2P-Next +rsync -avzP --del --exclude="*90sLogs*" $P2P_NEXT_REL_PATH george@coordinator.local:/home/george/P2P-Next +rsync -avzP --del --exclude="*90sLogs*" $P2P_NEXT_REL_PATH george@helper1.local:/home/george/P2P-Next +rsync -avzP --del --exclude="*90sLogs*" $P2P_NEXT_REL_PATH george@helper2.local:/home/george/P2P-Next +rsync -avzP --del --exclude="*90sLogs*" $P2P_NEXT_REL_PATH george@seeder1.local:/home/george/P2P-Next +rsync -avzP --del --exclude="*90sLogs*" $P2P_NEXT_REL_PATH george@seeder2.local:/home/george/P2P-Next +rsync -avzP --del --exclude="*90sLogs*" $P2P_NEXT_REL_PATH george@seeder3.local:/home/george/P2P-Next -- 2.20.1