More benchmark fixes

diff --git a/microbench/run-synwrite.sh b/microbench/run-synwrite.sh
index 1ca5f72..1aec47c 100755 (executable)
--- a/microbench/run-synwrite.sh
+++ b/microbench/run-synwrite.sh
@@ -12,6 +12,7 @@ run_synbench() {
     basename=$(date +%Y%m%d)-$1
     BLUESKY_RUN_NAME=$basename
 
     basename=$(date +%Y%m%d)-$1
     BLUESKY_RUN_NAME=$basename
 

+    $HOME/bin/s3-cleanup.py mvrable-bluesky-west

     run_cmd $PROXY cleanup-proxy
     run_cmd $PROXY run-proxy >$BLUESKY_RUN_NAME.proxy 2>&1 &
     proxy_pid=$!
     run_cmd $PROXY cleanup-proxy
     run_cmd $PROXY run-proxy >$BLUESKY_RUN_NAME.proxy 2>&1 &
     proxy_pid=$!


@@ -28,5 +29,5 @@ run_synbench() {
 }
 
 for BLUESKY_CACHE_SIZE in $((512 * 1024)); do
 }
 
 for BLUESKY_CACHE_SIZE in $((512 * 1024)); do

-    run_synbench "write-$(($BLUESKY_CACHE_SIZE / 1024))M"
+    run_synbench "write100-$(($BLUESKY_CACHE_SIZE / 1024))M"

 done
 done

diff --git a/microbench/setup/run-synwrite b/microbench/setup/run-synwrite
index 50ec59a..4d82756 100755 (executable)
--- a/microbench/setup/run-synwrite
+++ b/microbench/setup/run-synwrite
@@ -13,4 +13,4 @@ for e in "$@"; do
     fi
 done
 
     fi
 done
 

-(echo -n "# "; date; /scratch/bluesky.git/nfs3/writebench.py $SYNWRITE_RATE) >/scratch/synwrite/$BLUESKY_RUN_NAME.times
+(echo -n "# "; date; /scratch/bluesky.git/microbench/writebench.py $SYNWRITE_RATE) >/scratch/synwrite/$BLUESKY_RUN_NAME.times