Use s3cmd for cleaning up S3 storage accounts before benchmark runs.

diff --git a/README b/README
index dd29fb0..c8a4b06 100644 (file)
--- a/README
+++ b/README
@@ -15,3 +15,4 @@ Required dependencies (from base Debian install):
     libxml2-dev
     mercurial
     protobuf-compiler
+    s3cmd

diff --git a/microbench/run.sh b/microbench/run.sh
index 8a0dd74..8bae1c2 100755 (executable)
--- a/microbench/run.sh
+++ b/microbench/run.sh
@@ -32,7 +32,7 @@ benchmark_setup() {
     echo "Checking for sudo access..." 1>&2
     sudo whoami
     echo "Preparing for benchmark run..." 1>&2
-    $HOME/docs/2009/fall/s3test/s3-cleanup.py mvrable-bluesky
+    s3cmd -r --force del s3://mvrable-bluesky
     run_setup
     for i in {1..64}; do
         dd if=/dev/urandom of=/mnt/bluesky/file-$i bs=32k count=1