Compile fix for directory renaming; use virtual host access method for S3.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e774ebd..9384e61 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,4 +12,4 @@ add_subdirectory(kvstore)
 add_subdirectory(bluesky)
 add_subdirectory(nfs3)
 add_subdirectory(microbench)
-add_subdirectory(s3bench)
+add_subdirectory(cloudbench)

diff --git a/cloudbench/readbench.c b/cloudbench/readbench.c
index 277e1f3..8961eb8 100644 (file)
--- a/cloudbench/readbench.c
+++ b/cloudbench/readbench.c
@@ -252,7 +252,7 @@ int main(int argc, char *argv[])
 
     bucket.bucketName = "mvrable-benchmark";
     bucket.protocol = S3ProtocolHTTP;
-    bucket.uriStyle = S3UriStylePath;
+    bucket.uriStyle = S3UriStyleVirtualHost;
     bucket.accessKeyId = getenv("AWS_ACCESS_KEY_ID");
     bucket.secretAccessKey = getenv("AWS_SECRET_ACCESS_KEY");
 

diff --git a/cloudbench/readlatency.c b/cloudbench/readlatency.c
index 5a08a64..1fb8c20 100644 (file)
--- a/cloudbench/readlatency.c
+++ b/cloudbench/readlatency.c
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
 
     bucket.bucketName = "mvrable-benchmark";
     bucket.protocol = S3ProtocolHTTP;
-    bucket.uriStyle = S3UriStylePath;
+    bucket.uriStyle = S3UriStyleVirtualHost;
     bucket.accessKeyId = getenv("AWS_ACCESS_KEY_ID");
     bucket.secretAccessKey = getenv("AWS_SECRET_ACCESS_KEY");