Update Client configure

JIRA:BOTTLENECK-24

Change-Id: If64e10ecb0173afb987bf972af7c2ebf128aecac
Signed-off-by: QiLiang <liangqi1@huawei.com>

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
new file mode 100755 (executable)
index 0000000..2595cc4
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for CLIENT1 rubbos install
+if true; then
+ssh $CLIENT1_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT1_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $CLIENT1_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+ssh $CLIENT1_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT1_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT1_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT1_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $CLIENT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT1_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for CLIENT1 install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT1_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+fi
+
+# Packages for CLIENT1 configure
+if true; then
+ssh $CLIENT1_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT1_HOST:$WORK_HOME/rubbos_files
+scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT1_HOST:$WORK_HOME/rubbos_files
+ssh $CLIENT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties config.mk Makefile \
+         rubbos-servletsBO.sh rubbos-servletsRW.sh
+do
+    scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT1_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+fi
+

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
index 098df71..d78ebd2 100755 (executable)
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
@@ -16,12 +16,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
new file mode 100755 (executable)
index 0000000..8e80316
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for CLIENT2 rubbos install
+if true; then
+ssh $CLIENT2_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT2_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $CLIENT2_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+ssh $CLIENT2_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT2_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT2_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT2_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $CLIENT2_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT2_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for CLIENT2 install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT2_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+fi
+
+# Packages for CLIENT2 configure
+if true; then
+ssh $CLIENT2_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT2_HOST:$WORK_HOME/rubbos_files
+scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT2_HOST:$WORK_HOME/rubbos_files
+ssh $CLIENT2_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties config.mk Makefile \
+         rubbos-servletsBO.sh rubbos-servletsRW.sh
+do
+    scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT2_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+fi
+

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
index 098df71..d78ebd2 100755 (executable)
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
@@ -16,12 +16,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
new file mode 100755 (executable)
index 0000000..3bd5694
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for CLIENT3 rubbos install
+if true; then
+ssh $CLIENT3_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT3_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $CLIENT3_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+ssh $CLIENT3_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT3_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT3_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT3_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $CLIENT3_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT3_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for CLIENT3 install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT3_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+fi
+
+# Packages for CLIENT3 configure
+if true; then
+ssh $CLIENT3_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT3_HOST:$WORK_HOME/rubbos_files
+scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT3_HOST:$WORK_HOME/rubbos_files
+ssh $CLIENT3_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties config.mk Makefile \
+         rubbos-servletsBO.sh rubbos-servletsRW.sh
+do
+    scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT3_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+fi
+

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
index 098df71..d78ebd2 100755 (executable)
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
@@ -16,12 +16,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
new file mode 100755 (executable)
index 0000000..4d8ae9a
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for CLIENT4 rubbos install
+if true; then
+ssh $CLIENT4_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT4_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $CLIENT4_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+ssh $CLIENT4_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT4_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT4_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT4_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $CLIENT4_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT4_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for CLIENT4 install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT4_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+fi
+
+# Packages for CLIENT4 configure
+if true; then
+ssh $CLIENT4_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT4_HOST:$WORK_HOME/rubbos_files
+scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT4_HOST:$WORK_HOME/rubbos_files
+ssh $CLIENT4_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties config.mk Makefile \
+         rubbos-servletsBO.sh rubbos-servletsRW.sh
+do
+    scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT4_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+fi
+

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
index 098df71..d78ebd2 100755 (executable)
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
@@ -16,12 +16,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.

diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
index fd0915d..95dc08b 100755 (executable)
--- a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
@@ -15,6 +15,19 @@ do
 done
 fi
 
+if true; then
+for i in {1..4}
+do
+    for script in CLIENT${i}_rubbos_install.sh CLIENT${i}_install.sh \
+                  CLIENT${i}_configure.sh CLIENT${i}_uninstall.sh \
+                  CLIENT${i}_rubbos_uninstall.sh
+    do
+        CLIENT_HOST=`printenv CLIENT${i}_HOST`
+        scp $scp_options $script $CLIENT_HOST:/tmp
+    done
+done
+fi
+
 if true; then
 for script in HTTPD_install.sh HTTPD_rubbos_install.sh \
               HTTPD_configure.sh HTTPD_ignition.sh \
@@ -52,6 +65,10 @@ echo "*** prepare software packages ***"
 ./TOMCAT1_pkg_prepare.sh
 ./HTTPD_pkg_prepare.sh
 ./BENCHMARK_pkg_prepare.sh
+for i in {1..4}
+do
+    ./CLIENT${i}_pkg_prepare.sh
+done
 
 # Install and Configure and run Apache, Tomcat, CJDBC, and MySQL
 echo "*** install scripts & configure & execute ***********************"
@@ -77,9 +94,23 @@ ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh
 ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_rubbos_install.sh
 ssh $BENCHMARK_HOST /tmp/BENCHMARK_rubbos_install.sh
 
+for i in {1..4}
+do
+    CLIENT_HOST=`printenv CLIENT${i}_HOST`
+    ssh root@$CLIENT_HOST chmod 770 /tmp/CLIENT${i}_rubbos_install.sh
+    ssh $CLIENT_HOST /tmp/CLIENT${i}_rubbos_install.sh
+done
+
 ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_install.sh
 ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh
 
+for i in {1..4}
+do
+    CLIENT_HOST=`printenv CLIENT${i}_HOST`
+    ssh root@$CLIENT_HOST chmod 770 /tmp/CLIENT${i}_install.sh
+    ssh $CLIENT_HOST /tmp/CLIENT${i}_install.sh
+done
+
 ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_configure.sh
 ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh
 
@@ -92,6 +123,13 @@ ssh $HTTPD_HOST /tmp/HTTPD_configure.sh
 ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_configure.sh
 ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh
 
+for i in {1..4}
+do
+    CLIENT_HOST=`printenv CLIENT${i}_HOST`
+    ssh root@$CLIENT_HOST chmod 770 /tmp/CLIENT${i}_configure.sh
+    ssh $CLIENT_HOST /tmp/CLIENT${i}_configure.sh
+done
+
 ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_rubbosSL_configure.sh
 ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh
 

diff --git a/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh b/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
index 8d093cb..79fcb0e 100755 (executable)
--- a/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
+++ b/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
@@ -4,14 +4,14 @@ set -o allexport
 
 # HOSTS
 CONTROL_HOST=192.168.122.11
-BENCHMARK_HOST=192.168.122.19
-CLIENT1_HOST=192.168.122.11
-CLIENT2_HOST=192.168.122.11
-CLIENT3_HOST=192.168.122.11
-CLIENT4_HOST=192.168.122.11
-HTTPD_HOST=192.168.122.12
-TOMCAT1_HOST=192.168.122.14
+BHTTPD_HOST=192.168.122.12
 MYSQL1_HOST=192.168.122.13
+TOMCAT1_HOST=192.168.122.14
+CLIENT1_HOST=192.168.122.15
+CLIENT2_HOST=192.168.122.16
+CLIENT3_HOST=192.168.122.17
+CLIENT4_HOST=192.168.122.18
+ENCHMARK_HOST=192.168.122.19
 
 # Experiment name on OPNFV
 BOTTLNECKS_NAME=bottlenecks
@@ -22,7 +22,7 @@ OUTPUT_HOME=/bottlenecks/rubbos/rubbos_scripts/1-1-1
 SOFTWARE_HOME=/bottlenecks/rubbos/app_tools
 
 # Output directory for results of RUBBoS benchmark
-RUBBOS_RESULTS_HOST=192.168.122.11
+RUBBOS_RESULTS_HOST=${CONTROL_HOST}
 RUBBOS_RESULTS_DIR_BASE=/bottlenecks/rubbos/rubbos_results
 RUBBOS_RESULTS_DIR_NAME=2015-01-20T081237-0700