aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scenarios/fragments/minio.py4
-rw-r--r--scenarios/fragments/s3lat.py18
-rwxr-xr-xscenarios/minio-s3lat19
3 files changed, 34 insertions, 7 deletions
diff --git a/scenarios/fragments/minio.py b/scenarios/fragments/minio.py
index ab6f476..1bdd882 100644
--- a/scenarios/fragments/minio.py
+++ b/scenarios/fragments/minio.py
@@ -16,8 +16,8 @@ client = minio.Minio(
secret_key="minioadmin",
secure=False,
http_client=urllib3.PoolManager(
- timeout=5,
- retries=1,
+ timeout=2,
+ retries=False,
)
)
diff --git a/scenarios/fragments/s3lat.py b/scenarios/fragments/s3lat.py
index 7582350..47cdc8d 100644
--- a/scenarios/fragments/s3lat.py
+++ b/scenarios/fragments/s3lat.py
@@ -1,16 +1,24 @@
import os
from os.path import exists
from pathlib import Path
-from fragments import shared, garage
+from fragments import shared, minio, garage
s3bin = Path(os.path.dirname(__file__)) / "../../benchmarks/s3lat/s3lat"
+def common():
+ out = Path(shared.storage_path) / "s3lat.csv"
+ shared.log(f"launching s3lat ({s3bin})")
+ shared.exec(f"{s3bin} > {out}")
+ shared.log(f"execution done, output written to {out}")
+
def on_garage():
os.environ['AWS_ACCESS_KEY_ID'] = garage.key.access_key_id
os.environ['AWS_SECRET_ACCESS_KEY'] = garage.key.secret_access_key
os.environ['ENDPOINT'] = "localhost:3900"
+ common()
- out = Path(shared.storage_path) / "s3lat.csv"
- shared.log(f"launching s3lat ({s3bin})")
- shared.exec(f"{s3bin} > {out}")
- shared.log(f"execution done, output written to {out}")
+def on_minio():
+ os.environ['AWS_ACCESS_KEY_ID'] = minio.access_key
+ os.environ['AWS_SECRET_ACCESS_KEY'] = minio.secret_key
+ os.environ['ENDPOINT'] = "localhost:9000"
+ common()
diff --git a/scenarios/minio-s3lat b/scenarios/minio-s3lat
new file mode 100755
index 0000000..80d0997
--- /dev/null
+++ b/scenarios/minio-s3lat
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+from fragments import minio, s3lat, shared, flavor
+import sys
+
+
+for fl in sys.argv[1:]:
+ if fl in flavor.minio:
+ minio.version = flavor.minio[fl]
+
+if shared.id() == 1:
+ minio.deploy_coord()
+ s3lat.on_minio()
+ minio.delete_sync_bucket()
+ minio.destroy()
+else:
+ minio.deploy_follow()
+ minio.sync_on_bucket_down()
+ minio.destroy()
+shared.log("bye")