Spread test files for mixedbench across multiple subdirectories.

[bluesky.git] / microbench / run2.sh

diff --git a/microbench/run2.sh b/microbench/run2.sh
index 24f4348..a5297ac 100755 (executable)
--- a/microbench/run2.sh
+++ b/microbench/run2.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
-PARAMS="BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS"
+PARAMS="BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS BENCH_DIRSIZE"
 
 BENCHER=c09-44.sysnet.ucsd.edu
 PROXY=c09-45.sysnet.ucsd.edu
 
+SSH_ARGS=""
+
 get_params() {
     for p in $PARAMS; do
         if [ -n "${!p}" ]; then
@@ -17,27 +19,46 @@ run_cmd() {
     host="$1"; shift
     cmd="$1"; shift
     echo "EXECUTE($host):" "$cmd" "$@" 1>&2
-    ssh -l root $host /scratch/bluesky.git/microbench/setup/$cmd "$@" $(get_params)
+    ssh $SSH_ARGS -l root $host /scratch/bluesky.git/microbench/setup/$cmd "$@" $(get_params)
 }
 
-for size in 512; do
-    BENCH_DURATION=20
-    BENCH_WRITERATIO=0.0
-    BLUESKY_TARGET=s3
-    BLUESKY_CACHE_SIZE=$(($size * 1024))
-
-    PREFIX=$BLUESKY_TARGET-$BENCH_WRITERATIO
-
-    echo "SETTINGS:" $(get_params)
-    get_params >$PREFIX.settings
-
-    run_cmd $PROXY cleanup-proxy
-    run_cmd $PROXY run-proxy >$PREFIX.proxy 2>&1 &
-    proxy_pid=$!
-    sleep 10
-    run_cmd $BENCHER prepare-benchmark
-    run_cmd $BENCHER run-benchmark | tee $PREFIX.results
-    run_cmd $PROXY stop-proxy
-    echo "Waiting for proxy to stop..."
-    wait $proxy_pid
+BLUESKY_TARGET=s3
+BLUESKY_CACHE_SIZE=$((512 * 1024))
+BENCH_FILESIZE=$((1 << 20))
+BENCH_FILECOUNT=$((62))
+BENCH_WRITERATIO=0.0
+BENCH_THREADS=4
+BENCH_DURATION=120
+BENCH_INTERVALS=10
+BENCH_DIRSIZE=256
+
+#for size in 128 256 512 768 1024 1536 2048; do
+#    for filesize in 4 32 256 2048; do
+for size in 128 256 512 768 1024 1536 2048; do
+    for filesize in 4 1024; do
+        BENCH_FILESIZE=$(($filesize * 1024))
+        BENCH_FILECOUNT=$(($size * 1024 / $filesize / $BENCH_THREADS))
+        PREFIX=$BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-${filesize}k
+
+        $HOME/bin/s3-cleanup.py
+        SSH_ARGS="-t"
+        run_cmd $PROXY cleanup-proxy
+        SSH_ARGS=""
+        run_cmd $PROXY run-proxy >$PREFIX.proxy 2>&1 &
+        proxy_pid=$!
+        sleep 10
+        run_cmd $BENCHER prepare-benchmark
+
+        #for BENCH_OPS in 2000 1500 1000 800 600 400 200 100 80 40 20 10; do
+        for BENCH_OPS in 2000 1000 500 200 100 50 20 10; do
+            sleep 10
+            echo "SETTINGS:" $(get_params)
+            get_params >$PREFIX-$BENCH_OPS.settings
+            run_cmd $BENCHER run-benchmark | tee $PREFIX-$BENCH_OPS.results
+        done
+
+        run_cmd $PROXY stop-proxy
+        echo "Waiting for proxy to stop..."
+        wait $proxy_pid
+    done
 done