X-Git-Url: http://git.vrable.net/?p=bluesky.git;a=blobdiff_plain;f=microbench%2Frun-spec.sh;h=932ab678e0c8de69771500bf034e4d9ff601d48b;hp=bd2ab6369490bad62569ed502d77bcd2632b8d94;hb=dac1ee4bb07162cd8ad264365f5357f89a4fc849;hpb=59dcd584eb785bf5345ce8f4c6468c8f2f05630d

diff --git a/microbench/run-spec.sh b/microbench/run-spec.sh
index bd2ab63..932ab67 100755
--- a/microbench/run-spec.sh
+++ b/microbench/run-spec.sh
@@ -7,8 +7,8 @@ run_spec() {
     BLUESKY_RUN_NAME=$(date +%Y%m%d)-$1
     SPEC_CONF=$2
 
-    #$HOME/bin/s3-cleanup.py mvrable-bluesky
-    #$HOME/bin/s3-cleanup.py mvrable-bluesky-west
+    $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 >$BLUESKY_RUN_NAME.proxy 2>&1 &
     proxy_pid=$!
@@ -32,5 +32,44 @@ run_spec() {
 #run_spec s3-west-noseg sfs_bluesky
 
 # Standard test with Azure instead of Amazon S3 for storage
-BLUESKY_TARGET=azure
-run_spec azure sfs_bluesky
+#BLUESKY_TARGET=azure
+#run_spec azure sfs_bluesky
+
+# BlueSky, testing with a greater degree of parallelism
+#BLUESKY_TARGET=s3:mvrable-bluesky-west
+#BLUESKY_CACHE_SIZE=$((32 * 1024 * 1024))
+#BLUESKY_EXTRA_OPTS=""
+#run_spec s3-west-hi16-crypt sfs_bluesky-hi
+#
+#BLUESKY_TARGET=azure
+#BLUESKY_CACHE_SIZE=$((32 * 1024 * 1024))
+#BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_CRYPTO=1"
+#run_spec azure-hi16 sfs_bluesky-hi
+
+BLUESKY_TARGET=s3:mvrable-bluesky-west
+BLUESKY_CACHE_SIZE=$((32 * 1024 * 1024))
+BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_CRYPTO=1 BLUESKY_OPT_FULL_SEGMENTS=1"
+run_spec s3-west-hi16-fullfetch sfs_bluesky-hi
+
+BLUESKY_TARGET=s3:mvrable-bluesky-west
+BLUESKY_CACHE_SIZE=$((32 * 1024 * 1024))
+BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_CRYPTO=1 BLUESKY_OPT_NO_GROUP_READS=1"
+run_spec s3-west-hi16-noreadagg sfs_bluesky-hi
+
+BLUESKY_TARGET=s3:mvrable-bluesky-west
+BLUESKY_CACHE_SIZE=$((32 * 1024 * 1024))
+BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_CRYPTO=1 BLUESKY_OPT_NO_AGGREGATION=1"
+run_spec s3-west-hi16-nosegments sfs_bluesky-hi
+
+#BLUESKY_TARGET=native
+#run_spec native-hi8 sfs_bluesky-hi
+
+#BLUESKY_TARGET=s3:mvrable-bluesky-west
+#BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_GROUP_READS=1"
+#run_spec s3-west-noagg sfs_bluesky
+
+#BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_CRYPTO=1"
+#run_spec s3-west-nocrypt sfs_bluesky
+
+#BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_GROUP_READS=1 BLUESKY_OPT_NO_CRYPTO=1"
+#run_spec s3-west-noagg-nocrypt sfs_bluesky