fix: serialize concurrent property updates

Concurrent commands for the same app could each read a setting, change it, and write it back, so all of them exited successfully while silently dropping changes made by the others. Updates to app settings are now serialized so every change is kept, and readers never see a partially written value.
This commit is contained in:
Jose Diaz-Gonzalez committed 2026-10-21 21:21:57 -04:00
1 parent ba1d49576b
commit 9df45f6a6e
42 files changed
+1698 -642

No files matched your search

+23
View File
@@ -476,6 +476,29 @@ teardown() {
assert_output_contains "heroku-buildpack-python"
}
@test "(buildpacks:add) concurrent calls for the same app keep every buildpack" {
run run_concurrently 20 /bin/bash -c 'dokku buildpacks:add "$1" "https://github.com/dokku/buildpack-race$2.git"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku --quiet buildpacks:list $TEST_APP | grep -cE '^ *https://github.com/dokku/buildpack-race[0-9]+\.git$'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "20"
run run_concurrently 20 /bin/bash -c 'dokku buildpacks:remove "$1" "https://github.com/dokku/buildpack-race$2.git"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku --quiet buildpacks:list $TEST_APP | grep -cE '^ *https://github.com/dokku/buildpack-race[0-9]+\.git$'"
echo "output: $output"
echo "status: $status"
assert_output "0"
}
template_buildpacks_appjson() {
local APP="$1"
local APP_REPO_DIR="$2"
+23
View File
@@ -429,3 +429,26 @@ teardown() {
assert_success
assert_output_not_exists
}
@test "(caddy:labels:add) concurrent calls for the same app keep every label" {
run run_concurrently 20 /bin/bash -c 'dokku caddy:labels:add "$1" "caddy.race$2" value' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku caddy:labels:show $TEST_APP | grep -c 'caddy\.race[0-9]*=value'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "20"
run run_concurrently 20 /bin/bash -c 'dokku caddy:labels:remove "$1" "caddy.race$2"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku caddy:labels:show $TEST_APP 2>/dev/null | grep -c 'caddy\.race[0-9]*=value'"
echo "output: $output"
echo "status: $status"
assert_output "0"
}
+23
View File
@@ -374,3 +374,26 @@ teardown() {
assert_output_contains "Failure in name='port listening check': container listening on expected IPv4 interface with an unexpected port: expected=5000 actual=5001"
assert_output_contains "Running healthcheck name='port listening check' attempts=3 port=5000 retries=2 timeout=5 type='listening' wait=5"
}
@test "(checks:disable) concurrent calls for the same app keep every process type" {
run run_concurrently 20 /bin/bash -c 'dokku checks:disable "$1" "worker$2"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku checks:report $TEST_APP --checks-disabled-list | tr ',' '\n' | grep -cx 'worker[0-9]*'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "20"
run run_concurrently 20 /bin/bash -c 'dokku checks:enable "$1" "worker$2"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku checks:report $TEST_APP --checks-disabled-list | tr ',' '\n' | grep -cx 'worker[0-9]*'"
echo "output: $output"
echo "status: $status"
assert_output "0"
}
+23
View File
@@ -787,6 +787,29 @@ teardown() {
assert_output_contains "Invalid key name"
}
@test "(config:set) concurrent calls for the same app keep every key" {
run run_concurrently 20 /bin/bash -c 'dokku config:set --no-restart "$1" "RACE_KEY_$2=value"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku config:keys $TEST_APP | grep -cx 'RACE_KEY_[0-9]*'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "20"
run run_concurrently 20 /bin/bash -c 'dokku config:unset --no-restart "$1" "RACE_KEY_$2"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku config:keys $TEST_APP | grep -cx 'RACE_KEY_[0-9]*'"
echo "output: $output"
echo "status: $status"
assert_output "0"
}
block_app_config_dir() {
declare desc="makes the app config directory unwritable for the dokku user"
+23
View File
@@ -316,6 +316,29 @@ teardown() {
assert_output_contains "running"
}
@test "(docker-options:add) concurrent calls for the same app keep every option" {
run run_concurrently 20 /bin/bash -c 'dokku docker-options:add "$1" deploy "--label=race$2"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku docker-options:list $TEST_APP --phase deploy | grep -cx -- '--label=race[0-9]*'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "20"
run run_concurrently 20 /bin/bash -c 'dokku docker-options:remove "$1" deploy "--label=race$2"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku docker-options:list $TEST_APP --phase deploy | grep -cx -- '--label=race[0-9]*'"
echo "output: $output"
echo "status: $status"
assert_output "0"
}
web_worker_callback() {
local APP="$1"
local APP_REPO_DIR="$2"
+23
View File
@@ -415,3 +415,26 @@ teardown() {
assert_success
assert_output "true"
}
@test "(ports:add) concurrent calls for the same app keep every port mapping" {
run run_concurrently 20 /bin/bash -c 'dokku ports:add "$1" "http:$((8000 + $2)):5000"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku --quiet ports:report $TEST_APP --ports-map | tr ' ' '\n' | grep -cx 'http:80[0-9][0-9]:5000'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "20"
run run_concurrently 20 /bin/bash -c 'dokku ports:remove "$1" "http:$((8000 + $2)):5000"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku --quiet ports:report $TEST_APP --ports-map | tr ' ' '\n' | grep -cx 'http:80[0-9][0-9]:5000'"
echo "output: $output"
echo "status: $status"
assert_output "0"
}
+50
View File
@@ -488,3 +488,53 @@ teardown() {
run /bin/bash -c "dokku storage:destroy rdmtest-cache --force"
assert_success
}
@test "(storage:mount) concurrent calls for the same app keep every mount" {
run run_concurrently 20 /bin/bash -c 'dokku storage:create "rdmtest-race$1"' _
echo "output: $output"
echo "status: $status"
assert_success
run run_concurrently 20 /bin/bash -c 'dokku storage:mount "$1" "rdmtest-race$2" --container-dir "/race/$2"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '. | length'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "20"
run run_concurrently 20 /bin/bash -c 'dokku storage:unmount "$1" "rdmtest-race$2"' _ "$TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku storage:list $TEST_APP --format json | jq -r '. | length'"
echo "output: $output"
echo "status: $status"
assert_output "0"
run run_concurrently 20 /bin/bash -c 'dokku storage:destroy "rdmtest-race$1" --force' _
assert_success
}
@test "(storage:labels:set) concurrent calls for the same entry keep every label" {
run /bin/bash -c "dokku storage:create rdmtest-race-label"
assert_success
run run_concurrently 20 /bin/bash -c 'dokku storage:labels:set rdmtest-race-label "example.com/race$1" value' _
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku storage:info rdmtest-race-label --format json | jq -r '.labels | length'"
echo "output: $output"
echo "status: $status"
assert_success
assert_output "20"
run /bin/bash -c "dokku storage:destroy rdmtest-race-label --force"
assert_success
}
+20
View File
@@ -756,3 +756,23 @@ uninstall_k3s() {
echo "status: $status"
assert_success
}
run_concurrently() {
declare desc="runs a command COUNT times in parallel, appending the run number as the last argument, and fails if any run fails"
declare COUNT="$1"
shift 1
local i pid failed=0
local pids=()
for i in $(seq 1 "$COUNT"); do
"$@" "$i" &
pids+=("$!")
done
for pid in "${pids[@]}"; do
wait "$pid" || failed=$((failed + 1))
done
echo "failed runs: $failed"
[[ "$failed" -eq 0 ]]
}