Clear Magic IP

Clear magic ips, all node ips are configured in
set_bottlenecks_rubbos_env.sh

JIRA:BOTTLENECK-24

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

6 files changed, 35 insertions, 13 deletions

diff --git a/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties b/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties_template
index d9c77fe0..313d4d64 100644
--- a/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties
+++ b/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties_template
@@ -67,13 +67,13 @@ ps=/
 #
 # The workers that your plugins should create and work with
 #
-# Add 'inprocess' if you want JNI connector 
+# Add 'inprocess' if you want JNI connector
 worker.list=worker1
 # , inprocess
 
 
 worker.TOMCAT1.port=8009
-worker.TOMCAT1.host=192.168.122.14
+worker.TOMCAT1.host=REPLACE_TOMCAT1_HOST
 worker.TOMCAT1.type=ajp13
 worker.TOMCAT1.lbfactor=1
 
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties_template
index 42607c62..87a5fd8b 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties
+++ b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties_template
@@ -8,9 +8,9 @@
 #
 datasource.name         mysql
 
-datasource.url          jdbc:mysql://192.168.122.13:3306/rubbos
+datasource.url          jdbc:mysql://REPLACE_MYSQL1_HOST:3306/rubbos
 datasource.classname    com.mysql.jdbc.Driver
-  
+
 datasource.username     rubbos
 datasource.password     rubbos
 
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_200 b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template
index e7b65193..5da71987 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_200
+++ b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template
@@ -1,6 +1,6 @@
 
 #n HTTP server information
-httpd_hostname = 192.168.122.12
+httpd_hostname = REPLACE_HTTPD_HOST
 httpd_port = 8000
 
 # C/JDBC server to monitor (if any)
@@ -15,7 +15,7 @@ ejb_html_path =
 ejb_script_path =
 
 # Servlets server information
-servlets_server = 192.168.122.14
+servlets_server = REPLACE_TOMCAT1_HOST
 servlets_html_path = /rubbos
 servlets_script_path = /rubbos/servlet
 
@@ -24,14 +24,14 @@ php_html_path = /PHP
 php_script_path = /PHP
 
 #Database information
-database_master_server = 192.168.122.13
+database_master_server = REPLACE_MYSQL1_HOST
 
 database_slave_servers =
-workload_remote_client_nodes = 192.168.122.15,192.168.122.16,192.168.122.17,192.168.122.18
+workload_remote_client_nodes = REPLACE_CLIENT1_HOST,REPLACE_CLIENT2_HOST,REPLACE_CLIENT3_HOST,REPLACE_CLIENT4_HOST
 workload_remote_client_command = /bottlenecks/rubbos/app/jdk1.6.0_27/bin/java -classpath .:/bottlenecks/rubbos/app/RUBBoS/Client/:/bottlenecks/rubbos/app/RUBBoS/Client/rubbos_client.jar -Xmx1300m -Dhttp.keepAlive=true -Dhttp.maxConnections=1000000 edu.rice.rubbos.client.ClientEmulator
 
 
-workload_number_of_clients_per_node = 40
+workload_number_of_clients_per_node = REPLACE_NUMBER_OF_CLIENTS_PER_NODE
 
 
 # Workload: precise which transition table to use
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 3fa3047e..41f90c8e 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
@@ -18,20 +18,32 @@ ssh $BENCHMARK_HOST "
 "
 
 #TODO use for loop to genrate rubbos.properties file 200 ~ 1700
-for i in "rubbos.properties_200"
+for i in {2..2}
 do
 
   ssh $BENCHMARK_HOST "
     source /bottlenecks/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
     rm -f $RUBBOS_HOME/Client/rubbos.properties
   "
-  scp $OUTPUT_HOME/rubbos_conf/$i $BENCHMARK_HOST:$RUBBOS_HOME/Client/rubbos.properties
+
+  sed -e "s/REPLACE_HTTPD_HOST/$HTTPD_HOST/g" \
+      -e "s/REPLACE_TOMCAT1_HOST/$TOMCAT1_HOST/g" \
+      -e "s/REPLACE_MYSQL1_HOST/$MYSQL1_HOST/g" \
+      -e "s#REPLACE_CLIENT1_HOST#$CLIENT1_HOST#g" \
+      -e "s#REPLACE_CLIENT2_HOST#$CLIENT2_HOST#g" \
+      -e "s#REPLACE_CLIENT3_HOST#$CLIENT3_HOST#g" \
+      -e "s#REPLACE_CLIENT4_HOST#$CLIENT4_HOST#g" \
+      -e "s/REPLACE_NUMBER_OF_CLIENTS_PER_NODE/$((20*i))/g" \
+      $OUTPUT_HOME/rubbos_conf/rubbos.properties_template \
+      > $OUTPUT_HOME/rubbos_conf/rubbos.properties
+  scp $OUTPUT_HOME/rubbos_conf/rubbos.properties $BENCHMARK_HOST:$RUBBOS_HOME/Client/rubbos.properties
+  rm -rf $OUTPUT_HOME/rubbos_conf/rubbos.properties
 
   #echo "Resetting all data"
   #$OUTPUT_HOME/scripts/reset_all.sh
 
   # Browsing Only
-  echo "Start Browsing Only with $i"
+  echo "Start Browsing Only with rubbos.properties_$((100*i))"
   echo "Removing previous logs..."
   ssh $HTTPD_HOST "rm -f $HTTPD_HOME/logs/*log"
   ssh $TOMCAT1_HOST "rm -f $CATALINA_HOME/logs/*"
@@ -82,7 +94,7 @@ do
   #$OUTPUT_HOME/scripts/stop_all.sh
   $OUTPUT_HOME/scripts/kill_all.sh
   sleep 15
-  echo "End Browsing Only with $i"
+  echo "End Browsing Only with rubbos.properties_$((100*i))"
 
   # Read/Write
 
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
index e2dc3e8d..19f65428 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
@@ -29,7 +29,13 @@ fi
 if true; then
 ssh $HTTPD_HOST "mkdir -p $OUTPUT_HOME/apache_conf"
 scp $scp_options $OUTPUT_HOME/apache_conf/httpd.conf $HTTPD_HOST:$OUTPUT_HOME/apache_conf/httpd.conf
+
+sed -e "s/REPLACE_TOMCAT1_HOST/$TOMCAT1_HOST/g" \
+    $OUTPUT_HOME/apache_conf/workers.properties_template \
+    > $OUTPUT_HOME/apache_conf/workers.properties
 scp $scp_options $OUTPUT_HOME/apache_conf/workers.properties $HTTPD_HOST:$OUTPUT_HOME/apache_conf/workers.properties
+rm -rf $OUTPUT_HOME/apache_conf/workers.properties
+
 ssh $HTTPD_HOST "mkdir -p $WORK_HOME/apache_files"
 scp $scp_options -r $WORK_HOME/apache_files/rubbos_html $HTTPD_HOST:$WORK_HOME/apache_files/rubbos_html
 fi
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
index b2aacea8..d50a6daf 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
@@ -36,10 +36,14 @@ fi
 # Packages for TOMCAT1 rubbosSL configure
 if true; then
 ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+sed -e "s#REPLACE_MYSQL1_HOST#$MYSQL1_HOST#g" \
+    $OUTPUT_HOME/rubbos_conf/mysql.properties_template \
+    > $OUTPUT_HOME/rubbos_conf/mysql.properties
 for i in build.properties mysql.properties build.xml Config.java web.xml
 do
     scp $scp_options $OUTPUT_HOME/rubbos_conf/$i $TOMCAT1_HOST:$OUTPUT_HOME/rubbos_conf/$i
 done
+rm -rf $OUTPUT_HOME/rubbos_conf/mysql.properties
 
 ssh $TOMCAT1_HOST "mkdir -p $WORK_HOME/rubbos_files"
 scp $scp_options -r $WORK_HOME/rubbos_files/Servlets $TOMCAT1_HOST:$WORK_HOME/rubbos_files/Servlets