X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=microbench%2Frun2.sh;h=75b61de730ed95d7d0c42075d86f32fcb8a49828;hb=1e529ae15592d672b0825fd0e76c7b2b87fd95bb;hp=aaab88f41c439371f4401a50cc7ffc5a4f929617;hpb=2a6bdb2ebbec211fd16730983491a37575f855d8;p=bluesky.git

diff --git a/microbench/run2.sh b/microbench/run2.sh
index aaab88f..75b61de 100755
--- a/microbench/run2.sh
+++ b/microbench/run2.sh
@@ -1,45 +1,17 @@
 #!/bin/bash
 
-PARAMS="BLUESKY_RUN_NAME BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS BENCH_DIRSIZE BENCH_BLOCKSIZE NFS_BLOCKSIZE"
+BASEDIR=$(dirname $(which $0))
+. $BASEDIR/run-common.sh
 
-BLUESKY_RUN_NAME=$(date +%Y%m%d)-$$
-BENCHER=c09-44.sysnet.ucsd.edu
-PROXY=c09-45.sysnet.ucsd.edu
-
-SSH_ARGS="-i $HOME/.ssh/id_bluesky"
-
-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 $SSH_ARGS -l root $host /scratch/bluesky.git/microbench/setup/$cmd "$@" $(get_params)
-}
-
-BLUESKY_CACHE_SIZE=$((8 * 1024 * 1024))
-BENCH_FILESIZE=$((1024 * 1024))
-BENCH_BLOCKSIZE=0
-BENCH_FILECOUNT=$((62))
-BENCH_WRITERATIO=0.5
-BENCH_THREADS=4
-BENCH_DURATION=120
-BENCH_INTERVALS=10
-BENCH_DIRSIZE=128
-NFS_BLOCKSIZE=1048576
+BLUESKY_CACHE_SIZE=$((1024 * 1024))
 
 sizes="128 512 1024 2048 8192"
-ops_list="2000 1000 500 200 100 50 20 10"
+ops_list="1000 500 200 100 50 20 10"
 
 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
@@ -50,9 +22,10 @@ run_one() {
 
     for BENCH_OPS in $ops_list; do
         sleep 10
+        BLUESKY_RUN_NAME=$PREFIX-$BENCH_OPS
         echo "SETTINGS:" $(get_params)
-        get_params >$PREFIX-$BENCH_OPS.settings
-        run_cmd $BENCHER run-benchmark | tee $PREFIX-$BENCH_OPS.results
+        get_params >$BLUESKY_RUN_NAME.settings
+        (date; run_cmd $BENCHER run-benchmark) | tee $BLUESKY_RUN_NAME.results
     done
 
     run_cmd $PROXY stop-proxy
@@ -60,17 +33,17 @@ run_one() {
     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
     BENCH_FILECOUNT=$(($size * 1024 / ($BENCH_FILESIZE / 1024)))
 
     BENCH_BLOCKSIZE=32768
-    run_one $BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-32k
+    NFS_BLOCKSIZE=32768
+    run_one s3-$BENCH_WRITERATIO-${size}M-32k
 
     BENCH_BLOCKSIZE=0
-    run_one $BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-1024k
+    NFS_BLOCKSIZE=1048576
+    run_one s3-$BENCH_WRITERATIO-${size}M-1024k
 done
 }