X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=microbench%2Frun2.sh;h=75b61de730ed95d7d0c42075d86f32fcb8a49828;hb=388030970805a70cb4fad34ade5e3de7a3607a57;hp=d424294b8ef6afdde4161a20d41781629fe1f8ae;hpb=b533318a2e0a50f773066719a7a1984be2a2405b;p=bluesky.git

diff --git a/microbench/run2.sh b/microbench/run2.sh
index d424294..75b61de 100755
--- a/microbench/run2.sh
+++ b/microbench/run2.sh
@@ -1,78 +1,55 @@
 #!/bin/bash
 
-PARAMS="BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS BENCH_DIRSIZE BENCH_BLOCKSIZE"
+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))
 
-SSH_ARGS=""
+sizes="128 512 1024 2048 8192"
+ops_list="1000 500 200 100 50 20 10"
 
-get_params() {
-    for p in $PARAMS; do
-        if [ -n "${!p}" ]; then
-            echo "$p=${!p}"
-        fi
-    done
-}
+run_one() {
+    PREFIX=$1
 
-run_cmd() {
-    host="$1"; shift
-    cmd="$1"; shift
-    echo "EXECUTE($host):" "$cmd" "$@" 1>&2
-    ssh $SSH_ARGS -l root $host /scratch/bluesky.git/microbench/setup/$cmd "$@" $(get_params)
-}
+    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
 
-BLUESKY_CACHE_SIZE=$((512 * 1024))
-BENCH_FILESIZE=$((1 << 20))
-BENCH_BLOCKSIZE=0
-BENCH_FILECOUNT=$((62))
-BENCH_WRITERATIO=0.5
-BENCH_THREADS=4
-BENCH_DURATION=120
-BENCH_INTERVALS=10
-BENCH_DIRSIZE=128
+    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
 
-sizes="128 512 1024 2048"
+    run_cmd $PROXY stop-proxy
+    echo "Waiting for proxy to stop..."
+    wait $proxy_pid
+}
 
-#for size in 128 256 512 768 1024 1536 2048; do
-#    for filesize in 4 32 256 2048; do
 run_experiments() {
 for size in $sizes; do
-    for filesize in 4 32; do
-        BENCH_BLOCKSIZE=$(($filesize * 1024))
-        BENCH_FILECOUNT=$(($size * 1024 / ($BENCH_FILESIZE / 1024)))
-        PREFIX=$BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-${filesize}k
+    BENCH_FILECOUNT=$(($size * 1024 / ($BENCH_FILESIZE / 1024)))
 
-        $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
+    BENCH_BLOCKSIZE=32768
+    NFS_BLOCKSIZE=32768
+    run_one s3-$BENCH_WRITERATIO-${size}M-32k
 
-        run_cmd $PROXY stop-proxy
-        echo "Waiting for proxy to stop..."
-        wait $proxy_pid
-    done
+    BENCH_BLOCKSIZE=0
+    NFS_BLOCKSIZE=1048576
+    run_one s3-$BENCH_WRITERATIO-${size}M-1024k
 done
 }
 
-for BENCH_WRITERATIO in 0.0 1.0 0.5; do
-    BLUESKY_TARGET=s3
-    sizes="128 512 1024 2048"
-    run_experiments
+BLUESKY_TARGET=s3:mvrable-bluesky-west
+BENCH_THREADS=4
 
-    BLUESKY_TARGET=native
-    sizes=128
+for BENCH_WRITERATIO in 0.0 1.0 0.5; do
     run_experiments
 done