diff options
| author | MS <ms@taler.net> | 2023-07-27 13:11:56 +0200 |
|---|---|---|
| committer | MS <ms@taler.net> | 2023-07-27 13:11:56 +0200 |
| commit | 4b2f0f326b839c7af7d9579d922adc3ea3a13e3f (patch) | |
| tree | da045133bbd0aed1771d9d85651573d7b52ad0c0 | |
| parent | 4b47817978479f5585f0774127658da577213725 (diff) | |
| download | deployment-4b2f0f326b839c7af7d9579d922adc3ea3a13e3f.tar.gz deployment-4b2f0f326b839c7af7d9579d922adc3ea3a13e3f.tar.bz2 deployment-4b2f0f326b839c7af7d9579d922adc3ea3a13e3f.zip | |
NLnet task 5, get benchmark to complete.
| -rw-r--r-- | nlnet/task5/performance/.start.sh.swp | bin | 0 -> 12288 bytes | |||
| -rw-r--r-- | nlnet/task5/performance/Dockerfile | 1 | ||||
| -rwxr-xr-x | nlnet/task5/performance/start.sh | 28 |
3 files changed, 16 insertions, 13 deletions
diff --git a/nlnet/task5/performance/.start.sh.swp b/nlnet/task5/performance/.start.sh.swp Binary files differnew file mode 100644 index 0000000..78df566 --- /dev/null +++ b/nlnet/task5/performance/.start.sh.swp diff --git a/nlnet/task5/performance/Dockerfile b/nlnet/task5/performance/Dockerfile index d0e1996..4daeaf0 100644 --- a/nlnet/task5/performance/Dockerfile +++ b/nlnet/task5/performance/Dockerfile @@ -66,4 +66,5 @@ WORKDIR / COPY start.sh / RUN apt-get install -y wget +RUN apt-get install -y bc ENTRYPOINT ["/start.sh"] diff --git a/nlnet/task5/performance/start.sh b/nlnet/task5/performance/start.sh index e2ae44a..9ae2ada 100755 --- a/nlnet/task5/performance/start.sh +++ b/nlnet/task5/performance/start.sh @@ -26,7 +26,7 @@ export LD_LIBRARY_PATH=/usr/local/lib prepare_and_run () { taler-unified-setup.sh \ - -Wemtns \ + -Wwemtns \ -c /exchange/src/benchmark/benchmark-cs.conf \ -u exchange-account-2 &> /check_ready.txt & # Wait that the prep. went through. @@ -47,18 +47,7 @@ prepare_and_run () { echo FAIL exit 1 fi - NEXUS_PID=$(cat /libeufin-nexus.pid) - SANDBOX_PID=$(cat /libeufin-sandbox.pid) - - if test -z $NEXUS_PID; then - echo Could not find Nexus PID, failing. - exit 1 - fi - - if test -z $SANDBOX_PID; then - echo Could not find Sandbox PID, failing. - exit 1 - fi + echo Running the benchmark.. taler-exchange-benchmark \ -c /exchange/src/benchmark/benchmark-cs.conf.edited \ @@ -71,6 +60,19 @@ prepare_and_run () { export -f prepare_and_run /usr/bin/time -o /benchmark-wall-clock-time.txt --format=%e bash -c "prepare_and_run" +NEXUS_PID=$(cat /libeufin-nexus.pid) +SANDBOX_PID=$(cat /libeufin-sandbox.pid) + +if test -z $NEXUS_PID; then + echo Could not find Nexus PID, failing. + exit 1 +fi + +if test -z $SANDBOX_PID; then + echo Could not find Sandbox PID, failing. + exit 1 +fi + # Convert the wall clock time to milliseconds, to make # it compatible with the format as GREPped through Postgres logs. BENCHMARK_TOT_MS=$(awk -F. '{t=($1 * 1000 + $2 * 10)} END {print t}' /benchmark-wall-clock-time.txt) |