summaryrefslogtreecommitdiffstats
path: root/rubbos/rubbos_scripts/1-1-1/rubbos_conf
diff options
context:
space:
mode:
authorQiLiang <liangqi1@huawei.com>2016-01-08 01:27:55 +0000
committerQiLiang <liangqi1@huawei.com>2016-01-09 02:44:43 +0000
commit6e490df0346e26f9e6cc5dc79029a03e1d17a454 (patch)
tree04333ceadab525e1b89497f88f7919ecb9865dc0 /rubbos/rubbos_scripts/1-1-1/rubbos_conf
parent27a84e7905e66c005b02706ea3489576b5873c32 (diff)
Rubbos test case pipline minor update
- Add timestamp - Fix code pull bug - Shoten test run time JIRA: BOTTLENECK-24 Change-Id: Ie83fcf0e4a4ad2da715a694118f1f9e916a5f704 Signed-off-by: QiLiang <liangqi1@huawei.com>
Diffstat (limited to 'rubbos/rubbos_scripts/1-1-1/rubbos_conf')
-rw-r--r--rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh6
-rw-r--r--rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template6
2 files changed, 7 insertions, 5 deletions
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh
index 62c3c6cb..58b4ebe5 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh
+++ b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos-servletsBO.sh
@@ -47,8 +47,8 @@ done
#ssh $CLIENT3_HOST "$RUBBOS_HOME/bench/flush_cache 490000" # remote client
#ssh $CLIENT4_HOST "$RUBBOS_HOME/bench/flush_cache 490000" # remote client
-RAMPUP=480000
-MI=720000
+RAMPUP=48000
+MI=72000
current_seconds=`date +%s`
start_seconds=`echo \( $RAMPUP / 1000 \) + $current_seconds - 60 | bc`
SMI=`date -d "1970-01-01 $start_seconds secs UTC" +%Y%m%d%H%M%S`
@@ -61,7 +61,9 @@ do
ssh $scp_options $host "sudo nice -n -1 $RUBBOS_APP/cpu_mem.sh $SMI $EMI" &
done
+echo "Rubbos emulator start $(date)"
make emulator
+echo "Rubbos emulator end $(date)"
set -x
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template
index 5da71987..0e8a4b43 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template
+++ b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/rubbos.properties_template
@@ -43,11 +43,11 @@ workload_maximum_number_of_transitions = 1000
workload_use_tpcw_think_time = yes
workload_number_of_stories_per_page = 20
-workload_up_ramp_time_in_ms = 480000
+workload_up_ramp_time_in_ms = 48000
workload_up_ramp_slowdown_factor = 2
-workload_session_run_time_in_ms = 720000
-workload_down_ramp_time_in_ms = 30000
+workload_session_run_time_in_ms = 72000
+workload_down_ramp_time_in_ms = 3000
workload_down_ramp_slowdown_factor = 3
workload_percentage_of_author = 10