Updates to run microbenchmarks against S3 us-west.

diff --git a/microbench/run2.sh b/microbench/run2.sh
index b0928da..b6af7fd 100755 (executable)
--- a/microbench/run2.sh
+++ b/microbench/run2.sh
@@ -23,7 +23,7 @@ run_cmd() {
 }
 
 BLUESKY_CACHE_SIZE=$((512 * 1024))
-BENCH_FILESIZE=$((1024 << 10))
+BENCH_FILESIZE=$((1024 * 1024))
 BENCH_BLOCKSIZE=0
 BENCH_FILECOUNT=$((62))
 BENCH_WRITERATIO=0.5
@@ -33,16 +33,15 @@ BENCH_INTERVALS=10
 BENCH_DIRSIZE=128
 NFS_BLOCKSIZE=1048576
 
-sizes="128 512 1024 2048"
+sizes="128 512 1024 2048 8192"
 ops_list="2000 1000 500 200 100 50 20 10"
 
 run_one() {
     PREFIX=$1
 
-    $HOME/bin/s3-cleanup.py
-    SSH_ARGS="-t"
+    $HOME/bin/s3-cleanup.py mvrable-bluesky
+    $HOME/bin/s3-cleanup.py mvrable-bluesky-west
     run_cmd $PROXY cleanup-proxy
-    SSH_ARGS=""
     run_cmd $PROXY run-proxy >$PREFIX.proxy 2>&1 &
     proxy_pid=$!
     sleep 10
@@ -64,29 +63,19 @@ run_one() {
 #    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)))
 
-        run_one $PREFIX
-    done
+    BENCH_BLOCKSIZE=32768
+    run_one $BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-32k
+
+    BENCH_BLOCKSIZE=0
+    run_one $BLUESKY_TARGET-$BENCH_WRITERATIO-${size}M-1024k
 done
 }
 
-BLUESKY_TARGET=s3
-BENCH_FILESIZE=1048576
-BENCH_FILECOUNT=1024
-BENCH_WRITERATIO=0.0
+BLUESKY_TARGET=s3:mvrable-bluesky-west
 BENCH_THREADS=4
-run_one repeat-1024M-1024k
-
-#for BENCH_WRITERATIO in 0.0 1.0 0.5; do
-#    BLUESKY_TARGET=s3
-#    sizes="128 512 1024 2048"
-#    run_experiments
-#
-#    BLUESKY_TARGET=native
-#    sizes=128
-#    run_experiments
-#done
+
+for BENCH_WRITERATIO in 0.0 1.0 0.5; do
+    run_experiments
+done

diff --git a/microbench/setup/cleanup-proxy b/microbench/setup/cleanup-proxy
index c9a8c86..3fd185e 100755 (executable)
--- a/microbench/setup/cleanup-proxy
+++ b/microbench/setup/cleanup-proxy
@@ -2,8 +2,6 @@
 #
 # Start up the NFS server.
 
-. /scratch/aws-keys
-
 export BLUESKY_TARGET=s3
 # Export any environment variables specified on the command line
 for e in "$@"; do
@@ -21,5 +19,4 @@ if [ "$BLUESKY_TARGET" = "native" ]; then
     mount /export
 else
     rm -rf /export/journal
-    /scratch/bluesky.git/microbench/setup/s3-cleanup.py
 fi