X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=rubbos%2Frubbos_scripts%2F1-1-1%2Fscripts%2FCONTROL_rubbos_exec.sh;h=3fa3047e05786b74ff4a5eadecb0d6256da9f399;hb=5f87e77ba8b3fbfa60ead9be883484827abd90c1;hp=8c4dcc8507947869293f0948ee1e1b896a58af76;hpb=b50a8e1921ec002e79b7718f317d871a04f0550c;p=bottlenecks.git

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
index 8c4dcc85..3fa3047e 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CONTROL_rubbos_exec.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
+set -x
+
 cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
 source set_bottlenecks_rubbos_env.sh
+export scp_options='-o StrictHostKeyChecking=no -o BatchMode=yes'
 
 scp $WORK_HOME/monitors_files/oprofile_start.sh $MYSQL1_HOST:/tmp/
 
@@ -34,19 +37,16 @@ do
   ssh $TOMCAT1_HOST "rm -f $CATALINA_HOME/logs/*"
   ssh $MYSQL1_HOST "rm -f $MYSQL_HOME/run/*.log $RUBBOS_APP/mysql_mon-*"
 
-  #$OUTPUT_HOME/scripts/start_all.sh
-  #sleep 15
-
-  ssh $BENCHMARK_HOST "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
-  ssh $CLIENT1_HOST "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
-  ssh $CLIENT2_HOST "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
-  ssh $CLIENT3_HOST "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
-  ssh $CLIENT4_HOST "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
-  ssh $HTTPD_HOST "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
-  ssh $TOMCAT1_HOST "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
-  ssh $MYSQL1_HOST "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
-  ssh $MYSQL1_HOST "sudo rm -f /tmp/*.log"
-  ssh root@$MYSQL1_HOST chmod 777 /tmp/oprofile_start.sh
+  $OUTPUT_HOME/scripts/start_all.sh
+  sleep 15
+
+  for host in $BENCHMARK_HOST $CLIENT1_HOST $CLIENT2_HOST $CLIENT3_HOST \
+              $CLIENT4_HOST $HTTPD_HOST $TOMCAT1_HOST $MYSQL1_HOST
+  do
+    ssh $host "rm -f $RUBBOS_APP/sar-* $RUBBOS_APP/ps-* $RUBBOS_APP/iostat-*"
+  done
+  ssh $MYSQL1_HOST "rm -f /tmp/*.log"
+  ssh $MYSQL1_HOST chmod 777 /tmp/oprofile_start.sh
   #ssh $MYSQL1_HOST "
   #  cd /tmp
   #  ./oprofile_start.sh
@@ -54,6 +54,7 @@ do
 
   ssh $BENCHMARK_HOST "
     source /bottlenecks/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
+
     cd $RUBBOS_HOME/bench
     \rm -r 20*
 
@@ -64,46 +65,14 @@ do
     # Collect results
     echo "The benchmark has finished. Now, collecting results..."
     cd 20*
-    scp $BENCHMARK_HOST:$RUBBOS_APP/sar-* ./
-    scp $BENCHMARK_HOST:$RUBBOS_APP/ps-* ./
-    scp $BENCHMARK_HOST:$RUBBOS_APP/iostat-* ./
-    scp $BENCHMARK_HOST:$RUBBOS_APP/mysql_mon-* ./
-    scp $BENCHMARK_HOST:$RUBBOS_APP/postgres_lock-* ./
-    scp $CLIENT1_HOST:$RUBBOS_APP/sar-* ./
-    scp $CLIENT1_HOST:$RUBBOS_APP/ps-* ./
-    scp $CLIENT1_HOST:$RUBBOS_APP/iostat-* ./
-    scp $CLIENT1_HOST:$RUBBOS_APP/mysql_mon-* ./
-    scp $CLIENT1_HOST:$RUBBOS_APP/postgres_lock-* ./
-    scp $CLIENT2_HOST:$RUBBOS_APP/sar-* ./
-    scp $CLIENT2_HOST:$RUBBOS_APP/ps-* ./
-    scp $CLIENT2_HOST:$RUBBOS_APP/iostat-* ./
-    scp $CLIENT2_HOST:$RUBBOS_APP/mysql_mon-* ./
-    scp $CLIENT2_HOST:$RUBBOS_APP/postgres_lock-* ./
-    scp $CLIENT3_HOST:$RUBBOS_APP/sar-* ./
-    scp $CLIENT3_HOST:$RUBBOS_APP/ps-* ./
-    scp $CLIENT3_HOST:$RUBBOS_APP/iostat-* ./
-    scp $CLIENT3_HOST:$RUBBOS_APP/mysql_mon-* ./
-    scp $CLIENT3_HOST:$RUBBOS_APP/postgres_lock-* ./
-    scp $CLIENT4_HOST:$RUBBOS_APP/sar-* ./
-    scp $CLIENT4_HOST:$RUBBOS_APP/ps-* ./
-    scp $CLIENT4_HOST:$RUBBOS_APP/iostat-* ./
-    scp $CLIENT4_HOST:$RUBBOS_APP/mysql_mon-* ./
-    scp $CLIENT4_HOST:$RUBBOS_APP/postgres_lock-* ./
-    scp $HTTPD_HOST:$RUBBOS_APP/sar-* ./
-    scp $HTTPD_HOST:$RUBBOS_APP/ps-* ./
-    scp $HTTPD_HOST:$RUBBOS_APP/iostat-* ./
-    scp $HTTPD_HOST:$RUBBOS_APP/mysql_mon-* ./
-    scp $HTTPD_HOST:$RUBBOS_APP/postgres_lock-* ./
-    scp $TOMCAT1_HOST:$RUBBOS_APP/sar-* ./
-    scp $TOMCAT1_HOST:$RUBBOS_APP/ps-* ./
-    scp $TOMCAT1_HOST:$RUBBOS_APP/iostat-* ./
-    scp $TOMCAT1_HOST:$RUBBOS_APP/mysql_mon-* ./
-    scp $TOMCAT1_HOST:$RUBBOS_APP/postgres_lock-* ./
-    scp $MYSQL1_HOST:$RUBBOS_APP/sar-* ./
-    scp $MYSQL1_HOST:$RUBBOS_APP/ps-* ./
-    scp $MYSQL1_HOST:$RUBBOS_APP/iostat-* ./
-    scp $MYSQL1_HOST:$RUBBOS_APP/mysql_mon-* ./
-    scp $MYSQL1_HOST:$RUBBOS_APP/postgres_lock-* ./
+    for host in $BENCHMARK_HOST $CLIENT1_HOST $CLIENT2_HOST $CLIENT3_HOST \
+                $CLIENT4_HOST $HTTPD_HOST $TOMCAT1_HOST $MYSQL1_HOST
+    do
+      for f in sar-* ps-* iostat-* mysql_mon-* postgres_lock-*
+      do
+        scp $scp_options \$host:$RUBBOS_APP/\$f ./
+      done
+    done
     cd ..
     mv 20* $TMP_RESULTS_DIR_BASE/$RUBBOS_RESULTS_DIR_NAME/
   "
@@ -134,3 +103,6 @@ ssh $BENCHMARK_HOST "
 "
 
 echo "Finish RUBBoS"
+
+set +x
+