aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scenarios/fragments/flavor.py6
-rw-r--r--scenarios/fragments/s3concurrent.py16
-rwxr-xr-xscenarios/garage-s3concurrent2
3 files changed, 20 insertions, 4 deletions
diff --git a/scenarios/fragments/flavor.py b/scenarios/fragments/flavor.py
index 68c1f55..eeb8345 100644
--- a/scenarios/fragments/flavor.py
+++ b/scenarios/fragments/flavor.py
@@ -30,6 +30,6 @@ def download():
if exists(desc['path']): continue
shared.exec(f"mkdir -p {shared.binary_path}")
- shared.exec(f"wget https://garagehq.deuxfleurs.fr/_releases/{version['version']}/{version['target']}/garage -O {p}")
- shared.exec(f"chmod +x {p}")
- shared.exec(f"{p} --version")
+ shared.exec(f"wget https://garagehq.deuxfleurs.fr/_releases/{desc['version']}/{desc['target']}/garage -O {desc['path']}")
+ shared.exec(f"chmod +x {desc['path']}")
+ shared.exec(f"{desc['path']} --version")
diff --git a/scenarios/fragments/s3concurrent.py b/scenarios/fragments/s3concurrent.py
new file mode 100644
index 0000000..1431e0b
--- /dev/null
+++ b/scenarios/fragments/s3concurrent.py
@@ -0,0 +1,16 @@
+import os
+from os.path import exists
+from pathlib import Path
+from fragments import shared, garage
+
+s3bin = Path(os.path.dirname(__file__)) / "../../benchmarks/s3lat/s3lat"
+
+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"
+
+ out = Path(shared.storage_path) / "s3concurrent.csv"
+ shared.log(f"launching s3lat ({s3bin})")
+ shared.exec(f"{s3bin} > {out}")
+ shared.log(f"execution done, output written to {out}")
diff --git a/scenarios/garage-s3concurrent b/scenarios/garage-s3concurrent
index 1098451..5aaa4f4 100755
--- a/scenarios/garage-s3concurrent
+++ b/scenarios/garage-s3concurrent
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-from fragments import garage, s3lat, shared
+from fragments import garage, s3concurrent, shared
import sys
for flavor in sys.argv[1:]: