diff --git a/stress-tests/README.md b/stress-tests/README.md index 6417700..54ca977 100644 --- a/stress-tests/README.md +++ b/stress-tests/README.md @@ -11,11 +11,13 @@ This documents normalised stress-testing and references files under ## VM tests -- `vm-test.sh`: generate a text file to compare CPU and other factors across - VM types, providers or instances which may affect DD performance. +- `[vm-tests.sh][vm-tests.sh]`: generate a text file to compare CPU and other + factors across VM types, providers or instances which may affect DD + performance. -We can compare the resulting lgos just with, e.g. `vim -d`. +We can compare the resulting logs just with, e.g. `vim -d`. +[vm-tests.sh]: https://gitlab.com/DD-workspace/DD/-/tree/main/stress-tests/vm-tests.sh ## DD tests @@ -26,12 +28,17 @@ be interesting to expand them to interact with other services. This directory contains following files: -- `dd-stress-test.tpl.jmx`: template to generate [JMeter][jm] tests to execute -- `dd-tests.sh`: helper script that generates the actual test plan files and - executes them. See `./dd-tests.sh --help` -- `dd-test-selenium.sh`: this gives us an idea of how a user would perceive - DD to be behaving while under load. Called by `./dd-tests.sh` by default. +- `[dd-stress-test.tpl.jmx][dd-stress-test.tpl.jmx]`: template to generate + [JMeter][jm] tests to execute +- `[dd-tests.sh][dd-tests.sh]`: helper script that generates the actual test + plan files and executes them. See `./dd-tests.sh --help` +- `[dd-tests-selenium.py][dd-tests-selenium.py]`: this gives us an idea of + how a user would perceive DD to be behaving while under load. + Called by `./dd-tests.sh` by default. +[dd-stress-test.tpl.jmx]: https://gitlab.com/DD-workspace/DD/-/tree/main/stress-tests/dd-stress-test.tpl.jmx +[dd-tests.sh]: https://gitlab.com/DD-workspace/DD/-/tree/main/stress-tests/dd-tests.sh +[dd-tests-selenium.py]: https://gitlab.com/DD-workspace/DD/-/tree/main/stress-tests/dd-tests-selenium.py ### Results diff --git a/stress-tests/dd-test.sh b/stress-tests/dd-test.sh index e5d1985..6b4ef44 100755 --- a/stress-tests/dd-test.sh +++ b/stress-tests/dd-test.sh @@ -167,7 +167,7 @@ sed -E \ # Call Selenium test process in parallel if [ "${USE_SELENIUM}" = "YES" ]; then printf "\n\nRunning parallel Selenium-based tests:\t%s\tover %s seconds\n\n" "${DD_DOMAIN}" "${duration}" - python3 dd-test-selenium.py test --duration "${duration}" --out-dir "${out_dir}/selenium" "${DD_DOMAIN}" 2>&1 > "${out_dir}/selenium.log" & + python3 dd-tests-selenium.py test --duration "${duration}" --out-dir "${out_dir}/selenium" "${DD_DOMAIN}" 2>&1 > "${out_dir}/selenium.log" & fi # Execute test diff --git a/stress-tests/dd-test-selenium.py b/stress-tests/dd-tests-selenium.py similarity index 100% rename from stress-tests/dd-test-selenium.py rename to stress-tests/dd-tests-selenium.py diff --git a/stress-tests/vm-test.sh b/stress-tests/vm-tests.sh similarity index 96% rename from stress-tests/vm-test.sh rename to stress-tests/vm-tests.sh index 6d093ab..029541e 100644 --- a/stress-tests/vm-test.sh +++ b/stress-tests/vm-tests.sh @@ -2,7 +2,7 @@ LOG_FILE="${LOG_FILE:-vm-test.log}" -SYSBENCH="$(command -v sysbench2)" +SYSBENCH="$(command -v sysbench)" # Save stderr as well exec 2>&1