Code Review
/
bottlenecks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
rubbos run/exec scripts improvement
[bottlenecks.git]
/
rubbos
/
rubbos_scripts
/
1-1-1
/
scripts
/
run.sh
diff --git
a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
index
559d159
..
698eb41
100755
(executable)
--- a/
rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+++ b/
rubbos/rubbos_scripts/1-1-1/scripts/run.sh
@@
-4,107
+4,109
@@
cd /bottlenecks/rubbos/rubbos_scripts/1-1-1/scripts
# Transfer all sub scripts to target hosts
echo "*** scp scripts *************************************************"
# Transfer all sub scripts to target hosts
echo "*** scp scripts *************************************************"
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_checkScp_exec.sh $CONTROL_HOST:/tmp
+scp
_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_emulabConf
_exec.sh $CONTROL_HOST:/tmp
+scp
$scp_options CONTROL_checkScp
_exec.sh $CONTROL_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_rubbos
_exec.sh $CONTROL_HOST:/tmp
+scp
$scp_options CONTROL_emulabConf
_exec.sh $CONTROL_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos_install.sh $BENCHMARK
_HOST:/tmp
+scp
$scp_options CONTROL_rubbos_exec.sh $CONTROL
_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK
_install.sh $BENCHMARK_HOST:/tmp
+scp
$scp_options BENCHMARK_rubbos
_install.sh $BENCHMARK_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_configure
.sh $BENCHMARK_HOST:/tmp
+scp
$scp_options BENCHMARK_install
.sh $BENCHMARK_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_uninstall
.sh $BENCHMARK_HOST:/tmp
+scp
$scp_options BENCHMARK_configure
.sh $BENCHMARK_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos
_uninstall.sh $BENCHMARK_HOST:/tmp
+scp
$scp_options BENCHMARK
_uninstall.sh $BENCHMARK_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos_install.sh $CLIENT1
_HOST:/tmp
+scp
$scp_options BENCHMARK_rubbos_uninstall.sh $BENCHMARK
_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1
_install.sh $CLIENT1_HOST:/tmp
+scp
$scp_options CLIENT1_rubbos
_install.sh $CLIENT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_configure
.sh $CLIENT1_HOST:/tmp
+scp
$scp_options CLIENT1_install
.sh $CLIENT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_uninstall
.sh $CLIENT1_HOST:/tmp
+scp
$scp_options CLIENT1_configure
.sh $CLIENT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos
_uninstall.sh $CLIENT1_HOST:/tmp
+scp
$scp_options CLIENT1
_uninstall.sh $CLIENT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos_install.sh $CLIENT2
_HOST:/tmp
+scp
$scp_options CLIENT1_rubbos_uninstall.sh $CLIENT1
_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2
_install.sh $CLIENT2_HOST:/tmp
+scp
$scp_options CLIENT2_rubbos
_install.sh $CLIENT2_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_configure
.sh $CLIENT2_HOST:/tmp
+scp
$scp_options CLIENT2_install
.sh $CLIENT2_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_uninstall
.sh $CLIENT2_HOST:/tmp
+scp
$scp_options CLIENT2_configure
.sh $CLIENT2_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos
_uninstall.sh $CLIENT2_HOST:/tmp
+scp
$scp_options CLIENT2
_uninstall.sh $CLIENT2_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos_install.sh $CLIENT3
_HOST:/tmp
+scp
$scp_options CLIENT2_rubbos_uninstall.sh $CLIENT2
_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3
_install.sh $CLIENT3_HOST:/tmp
+scp
$scp_options CLIENT3_rubbos
_install.sh $CLIENT3_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_configure
.sh $CLIENT3_HOST:/tmp
+scp
$scp_options CLIENT3_install
.sh $CLIENT3_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_uninstall
.sh $CLIENT3_HOST:/tmp
+scp
$scp_options CLIENT3_configure
.sh $CLIENT3_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos
_uninstall.sh $CLIENT3_HOST:/tmp
+scp
$scp_options CLIENT3
_uninstall.sh $CLIENT3_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos_install.sh $CLIENT4
_HOST:/tmp
+scp
$scp_options CLIENT3_rubbos_uninstall.sh $CLIENT3
_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4
_install.sh $CLIENT4_HOST:/tmp
+scp
$scp_options CLIENT4_rubbos
_install.sh $CLIENT4_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_configure
.sh $CLIENT4_HOST:/tmp
+scp
$scp_options CLIENT4_install
.sh $CLIENT4_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_uninstall
.sh $CLIENT4_HOST:/tmp
+scp
$scp_options CLIENT4_configure
.sh $CLIENT4_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos
_uninstall.sh $CLIENT4_HOST:/tmp
+scp
$scp_options CLIENT4
_uninstall.sh $CLIENT4_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_install.sh $HTTPD
_HOST:/tmp
+scp
$scp_options CLIENT4_rubbos_uninstall.sh $CLIENT4
_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos
_install.sh $HTTPD_HOST:/tmp
+scp
$scp_options HTTPD
_install.sh $HTTPD_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_configure
.sh $HTTPD_HOST:/tmp
+scp
$scp_options HTTPD_rubbos_install
.sh $HTTPD_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_ignition
.sh $HTTPD_HOST:/tmp
+scp
$scp_options HTTPD_configure
.sh $HTTPD_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_stop
.sh $HTTPD_HOST:/tmp
+scp
$scp_options HTTPD_ignition
.sh $HTTPD_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos_uninstall
.sh $HTTPD_HOST:/tmp
+scp
$scp_options HTTPD_stop
.sh $HTTPD_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes HTTPD
_uninstall.sh $HTTPD_HOST:/tmp
+scp
$scp_options HTTPD_rubbos
_uninstall.sh $HTTPD_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_install.sh $TOMCAT1
_HOST:/tmp
+scp
$scp_options HTTPD_uninstall.sh $HTTPD
_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos
_install.sh $TOMCAT1_HOST:/tmp
+scp
$scp_options TOMCAT1
_install.sh $TOMCAT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_configure
.sh $TOMCAT1_HOST:/tmp
+scp
$scp_options TOMCAT1_rubbos_install
.sh $TOMCAT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbosSL
_configure.sh $TOMCAT1_HOST:/tmp
+scp
$scp_options TOMCAT1
_configure.sh $TOMCAT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_ignition
.sh $TOMCAT1_HOST:/tmp
+scp
$scp_options TOMCAT1_rubbosSL_configure
.sh $TOMCAT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_stop
.sh $TOMCAT1_HOST:/tmp
+scp
$scp_options TOMCAT1_ignition
.sh $TOMCAT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos_uninstall
.sh $TOMCAT1_HOST:/tmp
+scp
$scp_options TOMCAT1_stop
.sh $TOMCAT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1
_uninstall.sh $TOMCAT1_HOST:/tmp
+scp
$scp_options TOMCAT1_rubbos
_uninstall.sh $TOMCAT1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_install.sh $MYSQL
1_HOST:/tmp
+scp
$scp_options TOMCAT1_uninstall.sh $TOMCAT
1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_install.sh
$MYSQL1_HOST:/tmp
+scp
$scp_options MYSQL1_install.sh
$MYSQL1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_configure
.sh $MYSQL1_HOST:/tmp
+scp
$scp_options MYSQL1_rubbos_install
.sh $MYSQL1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_reset
.sh $MYSQL1_HOST:/tmp
+scp
$scp_options MYSQL1_configure
.sh $MYSQL1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_ignition
.sh $MYSQL1_HOST:/tmp
+scp
$scp_options MYSQL1_reset
.sh $MYSQL1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_stop
.sh $MYSQL1_HOST:/tmp
+scp
$scp_options MYSQL1_ignition
.sh $MYSQL1_HOST:/tmp
-scp
-o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_uninstall
.sh $MYSQL1_HOST:/tmp
+scp
$scp_options MYSQL1_stop
.sh $MYSQL1_HOST:/tmp
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_uninstall.sh $MYSQL1_HOST:/tmp
+scp $scp_options MYSQL1_rubbos_uninstall.sh $MYSQL1_HOST:/tmp
+
+scp $scp_options MYSQL1_uninstall.sh $MYSQL1_HOST:/tmp
# Install and Configure and run Apache, Tomcat, CJDBC, and MySQL
# Install and Configure and run Apache, Tomcat, CJDBC, and MySQL
@@
-115,43
+117,43
@@
echo "*** install scripts & configure & execute ***********************"
#ssh root@$CONTROL_HOST chmod 777 /tmp/CONTROL_emulabConf_exec.sh
#ssh $CONTROL_HOST /tmp/CONTROL_emulabConf_exec.sh
#ssh root@$CONTROL_HOST chmod 777 /tmp/CONTROL_emulabConf_exec.sh
#ssh $CONTROL_HOST /tmp/CONTROL_emulabConf_exec.sh
-ssh root@$MYSQL1_HOST chmod 77
7
/tmp/MYSQL1_install.sh
+ssh root@$MYSQL1_HOST chmod 77
0
/tmp/MYSQL1_install.sh
ssh $MYSQL1_HOST /tmp/MYSQL1_install.sh
ssh $MYSQL1_HOST /tmp/MYSQL1_install.sh
-ssh root@$TOMCAT1_HOST chmod 77
7
/tmp/TOMCAT1_install.sh
+ssh root@$TOMCAT1_HOST chmod 77
0
/tmp/TOMCAT1_install.sh
ssh $TOMCAT1_HOST /tmp/TOMCAT1_install.sh
ssh $TOMCAT1_HOST /tmp/TOMCAT1_install.sh
-
+ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_install.sh
ssh $HTTPD_HOST /tmp/HTTPD_install.sh
ssh $HTTPD_HOST /tmp/HTTPD_install.sh
-ssh root@$MYSQL1_HOST chmod 77
7
/tmp/MYSQL1_rubbos_install.sh
+ssh root@$MYSQL1_HOST chmod 77
0
/tmp/MYSQL1_rubbos_install.sh
ssh $MYSQL1_HOST /tmp/MYSQL1_rubbos_install.sh
ssh $MYSQL1_HOST /tmp/MYSQL1_rubbos_install.sh
-ssh root@$TOMCAT1_HOST chmod 77
7
/tmp/TOMCAT1_rubbos_install.sh
+ssh root@$TOMCAT1_HOST chmod 77
0
/tmp/TOMCAT1_rubbos_install.sh
ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbos_install.sh
ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbos_install.sh
-
+ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_rubbos_install.sh
ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh
ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh
-ssh root@$BENCHMARK_HOST chmod 77
7
/tmp/BENCHMARK_rubbos_install.sh
+ssh root@$BENCHMARK_HOST chmod 77
0
/tmp/BENCHMARK_rubbos_install.sh
ssh $BENCHMARK_HOST /tmp/BENCHMARK_rubbos_install.sh
ssh $BENCHMARK_HOST /tmp/BENCHMARK_rubbos_install.sh
-ssh root@$CLIENT1_HOST chmod 77
7 /tmp/CLIENT1_rubbos_install.sh
-ssh $CLIENT1_HOST /tmp/CLIENT1_rubbos_install.sh
+ssh root@$CLIENT1_HOST chmod 77
0 /tmp/CLIENT1_rubbos_install.sh
+ssh $CLIENT1_HOST /tmp/CLIENT1_rubbos_install.sh
-ssh root@$CLIENT2_HOST chmod 77
7
/tmp/CLIENT2_rubbos_install.sh
+ssh root@$CLIENT2_HOST chmod 77
0
/tmp/CLIENT2_rubbos_install.sh
ssh $CLIENT2_HOST /tmp/CLIENT2_rubbos_install.sh
ssh $CLIENT2_HOST /tmp/CLIENT2_rubbos_install.sh
-ssh root@$CLIENT3_HOST chmod 77
7
/tmp/CLIENT3_rubbos_install.sh
+ssh root@$CLIENT3_HOST chmod 77
0
/tmp/CLIENT3_rubbos_install.sh
ssh $CLIENT3_HOST /tmp/CLIENT3_rubbos_install.sh
ssh $CLIENT3_HOST /tmp/CLIENT3_rubbos_install.sh
-ssh root@$CLIENT4_HOST chmod 77
7
/tmp/CLIENT4_rubbos_install.sh
+ssh root@$CLIENT4_HOST chmod 77
0
/tmp/CLIENT4_rubbos_install.sh
ssh $CLIENT4_HOST /tmp/CLIENT4_rubbos_install.sh
ssh $CLIENT4_HOST /tmp/CLIENT4_rubbos_install.sh
-ssh root@$BENCHMARK_HOST chmod 77
7
/tmp/BENCHMARK_install.sh
+ssh root@$BENCHMARK_HOST chmod 77
0
/tmp/BENCHMARK_install.sh
ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh
ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh
-ssh root@$CLIENT1_HOST chmod 77
7
/tmp/CLIENT1_install.sh
+ssh root@$CLIENT1_HOST chmod 77
0
/tmp/CLIENT1_install.sh
ssh $CLIENT1_HOST /tmp/CLIENT1_install.sh
#ssh root@$CLIENT2_HOST chmod 777 /tmp/CLIENT2_install.sh
ssh $CLIENT1_HOST /tmp/CLIENT1_install.sh
#ssh root@$CLIENT2_HOST chmod 777 /tmp/CLIENT2_install.sh
@@
-163,20
+165,20
@@
ssh $CLIENT1_HOST /tmp/CLIENT1_install.sh
#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_install.sh
#ssh $CLIENT4_HOST /tmp/CLIENT4_install.sh
#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_install.sh
#ssh $CLIENT4_HOST /tmp/CLIENT4_install.sh
-ssh root@$MYSQL1_HOST chmod 77
7
/tmp/MYSQL1_configure.sh
+ssh root@$MYSQL1_HOST chmod 77
0
/tmp/MYSQL1_configure.sh
ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh &
sleep 60
ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh &
sleep 60
-ssh root@$TOMCAT1_HOST chmod 77
7
/tmp/TOMCAT1_configure.sh
+ssh root@$TOMCAT1_HOST chmod 77
0
/tmp/TOMCAT1_configure.sh
ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh
ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh
-
+ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_configure.sh
ssh $HTTPD_HOST /tmp/HTTPD_configure.sh
ssh $HTTPD_HOST /tmp/HTTPD_configure.sh
-ssh root@$BENCHMARK_HOST chmod 77
7
/tmp/BENCHMARK_configure.sh
+ssh root@$BENCHMARK_HOST chmod 77
0
/tmp/BENCHMARK_configure.sh
ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh
ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh
-ssh root@$CLIENT1_HOST chmod 77
7
/tmp/CLIENT1_configure.sh
+ssh root@$CLIENT1_HOST chmod 77
0
/tmp/CLIENT1_configure.sh
ssh $CLIENT1_HOST /tmp/CLIENT1_configure.sh
#ssh root@$CLIENT2_HOST chmod 777 /tmp/CLIENT2_configure.sh
ssh $CLIENT1_HOST /tmp/CLIENT1_configure.sh
#ssh root@$CLIENT2_HOST chmod 777 /tmp/CLIENT2_configure.sh
@@
-188,8
+190,8
@@
ssh $CLIENT1_HOST /tmp/CLIENT1_configure.sh
#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_configure.sh
#ssh $CLIENT4_HOST /tmp/CLIENT4_configure.sh
#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_configure.sh
#ssh $CLIENT4_HOST /tmp/CLIENT4_configure.sh
-ssh root@$TOMCAT1_HOST chmod 77
7
/tmp/TOMCAT1_rubbosSL_configure.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh
+ssh root@$TOMCAT1_HOST chmod 77
0
/tmp/TOMCAT1_rubbosSL_configure.sh
+ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh
#ssh $CONTROL_HOST /tmp/CONTROL_rubbos_exec.sh
#ssh $CONTROL_HOST /tmp/CONTROL_rubbos_exec.sh