X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=microbench%2Frun2.sh;h=75b61de730ed95d7d0c42075d86f32fcb8a49828;hb=HEAD;hp=24f43484f53250ddfc5c12a7f9e1604225214852;hpb=b2752c1bde79356615a2398195a16979b4570b20;p=bluesky.git

diff --git a/microbench/run2.sh b/microbench/run2.sh
index 24f4348..75b61de 100755
--- a/microbench/run2.sh
+++ b/microbench/run2.sh
@@ -1,43 +1,55 @@
 #!/bin/bash
 
-PARAMS="BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS"
+BASEDIR=$(dirname $(which $0))
+. $BASEDIR/run-common.sh
 
-BENCHER=c09-44.sysnet.ucsd.edu
-PROXY=c09-45.sysnet.ucsd.edu
+BLUESKY_CACHE_SIZE=$((1024 * 1024))
 
-get_params() {
-    for p in $PARAMS; do
-        if [ -n "${!p}" ]; then
-            echo "$p=${!p}"
-        fi
-    done
-}
-
-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)
-}
-
-for size in 512; do
-    BENCH_DURATION=20
-    BENCH_WRITERATIO=0.0
-    BLUESKY_TARGET=s3
-    BLUESKY_CACHE_SIZE=$(($size * 1024))
+sizes="128 512 1024 2048 8192"
+ops_list="1000 500 200 100 50 20 10"
 
-    PREFIX=$BLUESKY_TARGET-$BENCH_WRITERATIO
-
-    echo "SETTINGS:" $(get_params)
-    get_params >$PREFIX.settings
+run_one() {
+    PREFIX=$1
 
+    BLUESKY_RUN_NAME=$PREFIX
+    $HOME/bin/s3-cleanup.py mvrable-bluesky
+    $HOME/bin/s3-cleanup.py mvrable-bluesky-west
     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
+
+    for BENCH_OPS in $ops_list; do
+        sleep 10
+        BLUESKY_RUN_NAME=$PREFIX-$BENCH_OPS
+        echo "SETTINGS:" $(get_params)
+        get_params >$BLUESKY_RUN_NAME.settings
+        (date; run_cmd $BENCHER run-benchmark) | tee $BLUESKY_RUN_NAME.results
+    done
+
     run_cmd $PROXY stop-proxy
     echo "Waiting for proxy to stop..."
     wait $proxy_pid
+}
+
+run_experiments() {
+for size in $sizes; do
+    BENCH_FILECOUNT=$(($size * 1024 / ($BENCH_FILESIZE / 1024)))
+
+    BENCH_BLOCKSIZE=32768
+    NFS_BLOCKSIZE=32768
+    run_one s3-$BENCH_WRITERATIO-${size}M-32k
+
+    BENCH_BLOCKSIZE=0
+    NFS_BLOCKSIZE=1048576
+    run_one s3-$BENCH_WRITERATIO-${size}M-1024k
+done
+}
+
+BLUESKY_TARGET=s3:mvrable-bluesky-west
+BENCH_THREADS=4
+
+for BENCH_WRITERATIO in 0.0 1.0 0.5; do
+    run_experiments
 done