Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FIX (e2e): Time docker stop with bash's clock, since uutils date on Namespace runners prints nanoseconds for %3N and failed the clean-shutdown case

Rostislav Duginb580aa40c75d
diff --git a/e2e/docker-storage/run.sh b/e2e/docker-storage/run.sh
index 4d8b2b69..46e770da 100755
--- a/e2e/docker-storage/run.sh
+++ b/e2e/docker-storage/run.sh
@@ -999,13 +999,15 @@ start_databasus_on_new_volume() {
check_docker_stop_shuts_down_cleanly() {
local container_name="databasus-storage-clean-stop-${run_id}"
- local stop_started_at_ms
+ local stop_started_at_us
local stop_duration_ms
start_databasus_on_new_volume "${container_name}"
- stop_started_at_ms="$(date +%s%3N)"
+ # The uutils date on the Namespace runners printed nanoseconds for %3N, so the clock comes
+ # from bash instead.
+ stop_started_at_us="${EPOCHREALTIME/./}"
docker stop "${container_name}" >/dev/null
- stop_duration_ms="$(($(date +%s%3N) - stop_started_at_ms))"
+ stop_duration_ms="$(((${EPOCHREALTIME/./} - stop_started_at_us) / 1000))"
if ((stop_duration_ms >= 10000)); then
echo "docker stop took ${stop_duration_ms} ms, so the stop timeout ended the container" >&2