maria-developers team mailing list archive

[Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>]

At file:///Users/hakan/work/monty_program/mariadb-tools/

------------------------------------------------------------
revno: 24 [merge]
revision-id: hakan@xxxxxxxxxxxx-20100309220617-3ti82bv9tvlvx5w6
parent: hakan@xxxxxxxxxxxx-20100309220559-6u2f1d4hcjcchc1n
parent: hakan@xxxxxxxxxxxx-20100309220348-qpzbd0lavfwxneuy
committer: Hakan Kuecuekyilmaz <hakan@xxxxxxxxxxxx>
branch nick: mariadb-tools
timestamp: Tue 2010-03-09 23:06:17 +0100
message:
  Merge.
modified:
  sysbench/run-sysbench-myisam.sh runsysbenchmyisam.sh-20100303192900-8z3drtmisv1b19uy-1
  sysbench/run-sysbench.sh       runsysbench.sh-20100219052618-ybly665ohw916cxl-3

=== modified file 'sysbench/run-sysbench-myisam.sh'
--- a/sysbench/run-sysbench-myisam.sh	2010-03-09 15:06:22 +0000
+++ b/sysbench/run-sysbench-myisam.sh	2010-03-09 22:03:48 +0000
@@ -7,6 +7,16 @@
 #   killall -9, which can cause severe side effects!
 #   * By bzr pull we mean bzr merge --pull
 #
+# Index sizes for 20 mio rows (--table-size=20000000).
+#   * delete.lua:           313M  sbtest.MYI
+#   * insert.lua:           4.0K  sbtest.MYI
+#   * oltp_complex_ro.lua:  313M  sbtest.MYI
+#   * oltp_complex_rw.lua:  313M  sbtest.MYI
+#   * oltp_simple.lua:      325M  sbtest.MYI
+#   * select.lua:           313M  sbtest.MYI
+#   * update_index.lua:     313M  sbtest.MYI
+#   * update_non_index.lua: 313M  sbtest.MYI
+#
 # Hakan Kuecuekyilmaz <hakan at askmonty dot org> 2010-02-19.
 #
 
@@ -79,6 +89,9 @@
 # The run time we use for sysbench.
 RUN_TIME=300
 
+# Warm up time we use for sysbench.
+WARM_UP_TIME=180
+
 # How many times we run each test.
 LOOP_COUNT=3
 
@@ -99,7 +112,6 @@
 #   otherwise we get a table full error while preparing the run.
 #
 SYSBENCH_OPTIONS="--oltp-table-size=$TABLE_SIZE \
-  --max-time=$RUN_TIME \
   --max-requests=0 \
   --mysql-table-engine=MyISAM \
   --mysql-user=root \
@@ -293,7 +305,8 @@
         echo "[$(date "+%Y-%m-%d %H:%M:%S")] Running $SYSBENCH_TEST with $THREADS threads and $LOOP_COUNT iterations for $PRODUCT" | tee ${THIS_RESULT_DIR}/results.txt
         echo '' >> ${THIS_RESULT_DIR}/results.txt
 
-        SYSBENCH_OPTIONS="$SYSBENCH_OPTIONS --num-threads=$THREADS"
+        SYSBENCH_OPTIONS_WARM_UP="${SYSBENCH_OPTIONS} --num-threads=1 --max-time=$WARM_UP_TIME"
+        SYSBENCH_OPTIONS_RUN="${SYSBENCH_OPTIONS} --num-threads=$THREADS --max-time=$RUN_TIME"
 
         k=0
         while [ $k -lt $LOOP_COUNT ]
@@ -312,7 +325,9 @@
             start_mysqld
             sync
 
-            $SYSBENCH $SYSBENCH_OPTIONS run > ${THIS_RESULT_DIR}/result${k}.txt 2>&1
+            $SYSBENCH $SYSBENCH_OPTIONS_WARM_UP run
+            sync
+            $SYSBENCH $SYSBENCH_OPTIONS_RUN run > ${THIS_RESULT_DIR}/result${k}.txt 2>&1
             
             grep "write requests:" ${THIS_RESULT_DIR}/result${k}.txt | awk '{ print $4 }' | sed -e 's/(//' >> ${THIS_RESULT_DIR}/results.txt
 

=== modified file 'sysbench/run-sysbench.sh'
--- a/sysbench/run-sysbench.sh	2010-03-09 15:06:22 +0000
+++ b/sysbench/run-sysbench.sh	2010-03-09 22:03:48 +0000
@@ -90,6 +90,9 @@
 # The run time we use for sysbench.
 RUN_TIME=300
 
+# Warm up time we use for sysbench.
+WARM_UP_TIME=180
+
 # How many times we run each test.
 LOOP_COUNT=3
 
@@ -106,7 +109,6 @@
   update_non_index.lua"
 
 SYSBENCH_OPTIONS="--oltp-table-size=$TABLE_SIZE \
-  --max-time=$RUN_TIME \
   --max-requests=0 \
   --mysql-table-engine=InnoDB \
   --mysql-user=root \
@@ -299,7 +301,8 @@
         echo "[$(date "+%Y-%m-%d %H:%M:%S")] Running $SYSBENCH_TEST with $THREADS threads and $LOOP_COUNT iterations for $PRODUCT" | tee ${THIS_RESULT_DIR}/results.txt
         echo '' >> ${THIS_RESULT_DIR}/results.txt
 
-        SYSBENCH_OPTIONS="$SYSBENCH_OPTIONS --num-threads=$THREADS"
+        SYSBENCH_OPTIONS_WARM_UP="${SYSBENCH_OPTIONS} --num-threads=1 --max-time=$WARM_UP_TIME"
+        SYSBENCH_OPTIONS_RUN="${SYSBENCH_OPTIONS} --num-threads=$THREADS --max-time=$RUN_TIME"
 
         k=0
         while [ $k -lt $LOOP_COUNT ]
@@ -318,7 +321,9 @@
             start_mysqld
             sync
 
-            $SYSBENCH $SYSBENCH_OPTIONS run > ${THIS_RESULT_DIR}/result${k}.txt 2>&1
+            $SYSBENCH $SYSBENCH_OPTIONS_WARM_UP run
+            sync
+            $SYSBENCH $SYSBENCH_OPTIONS_RUN run > ${THIS_RESULT_DIR}/result${k}.txt 2>&1
             
             grep "write requests:" ${THIS_RESULT_DIR}/result${k}.txt | awk '{ print $4 }' | sed -e 's/(//' >> ${THIS_RESULT_DIR}/results.txt