diff --git a/garage-latency-simple.R b/garage-latency-simple.R index a02b6a8..933ab63 100755 --- a/garage-latency-simple.R +++ b/garage-latency-simple.R @@ -1,4 +1,5 @@ #!/usr/bin/env Rscript +system("mkdir -p ~/R") .libPaths(c("~/R", .libPaths())) repo <- "https://cran.r-project.org" @@ -31,6 +32,10 @@ if (!file.exists("~/go/bin/s3lat")) { } if (!file.exists("50ms.garage.csv")) { + system("rm -fr /tmp/garage-testnet") + if (file.exists(".current_state.yml")) { + system("mknet destroy") + } system("mknet create ./mknet/single-dc.yml") system("mknet run-all ./mknet/deploy_garage.sh") system("mknet run dc1:dc1s1 ./mknet/bench_garage.sh") @@ -38,7 +43,10 @@ if (!file.exists("50ms.garage.csv")) { } if (!file.exists("50ms.minio.csv")) { - system("mknet create ./mknet/single-dc.yaml") + if (file.exists(".current_state.yml")) { + system("mknet destroy") + } + system("mknet create ./mknet/single-dc.yml") system("mknet run-all ./mknet/deploy_minio.py") system("mknet run dc1:dc1s1 ./mknet/bench_minio.sh") system("mknet destroy") diff --git a/mknet/bench_garage.sh b/mknet/bench_garage.sh index 3f6e5c0..89afc61 100755 --- a/mknet/bench_garage.sh +++ b/mknet/bench_garage.sh @@ -1,5 +1,27 @@ #!/bin/bash +echo "10 sec to start" +sleep 10 + +CONFIG_NODE_FPATH=$(find /tmp/garage-testnet/ -maxdepth 3 -name garage.toml|head -n 1) + +garage -c ${CONFIG_NODE_FPATH} key new --name bench +for i in $(seq 1 10); do + garage -c ${CONFIG_NODE_FPATH} bucket create bench$i + garage -c ${CONFIG_NODE_FPATH} bucket allow --read --write bench$i --key bench +done + +openssl req \ + -new \ + -x509 \ + -keyout /tmp/garage.key \ + -out /tmp/garage.crt \ + -nodes \ + -subj "/C=XX/ST=XX/L=XX/O=XX/OU=XX/CN=localhost/emailAddress=X@X.XX" \ + -addext "subjectAltName = DNS:localhost, IP:127.0.0.1" + +cat /tmp/garage.key /tmp/garage.crt > /tmp/garage.pem + socat "openssl-listen:4443,\ reuseaddr,\ fork,\ @@ -12,7 +34,7 @@ export SSL=1 export SSL_INSECURE=1 export REGION=garage export ENDPOINT=localhost:4443 -export AWS_ACCESS_KEY_ID=GK4ea45d2f25091883071e0b73 -export AWS_SECRET_ACCESS_KEY=334f7b0ef233571c67b302c5197e6b8c7150da1907e4e530caa82e041d725ecf +export AWS_ACCESS_KEY_ID=$(garage -c ${CONFIG_NODE_FPATH} key info bench|grep 'Key ID:'|grep -Po 'GK[a-f0-9]+$') +export AWS_SECRET_ACCESS_KEY=$(garage -c ${CONFIG_NODE_FPATH} key info bench|grep 'Secret key:'|grep -Po '[a-f0-9]+$') -/home/quentin/go/bin/bench-garage | tee 50ms.garage.csv +s3lat | tee 50ms.garage.csv diff --git a/mknet/bench_minio.sh b/mknet/bench_minio.sh index eb00758..d5f1bdd 100755 --- a/mknet/bench_minio.sh +++ b/mknet/bench_minio.sh @@ -1,7 +1,15 @@ #!/bin/bash +echo "sleep 60" +sleep 60 + export ENDPOINT=[fc00:9a7a:9e::1]:9000 export AWS_ACCESS_KEY_ID=minioadmin export AWS_SECRET_ACCESS_KEY=minioadmin +mc alias set minio-bench http://$ENDPOINT $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY +for i in $(seq 1 10); do + mc mb minio-bench/bench$i +done + s3lat | tee 50ms.minio.csv