From 449173b06c4dcf642364406e8b810e7046f60eef Mon Sep 17 00:00:00 2001 From: David Shen Date: Mon, 27 Apr 2026 19:43:33 -0400 Subject: [PATCH] Reorder devcontainer failure handler to address race setting status --- startupscript/butane/devcontainer-failure-handler.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/startupscript/butane/devcontainer-failure-handler.sh b/startupscript/butane/devcontainer-failure-handler.sh index f90264f4..56ba0db0 100755 --- a/startupscript/butane/devcontainer-failure-handler.sh +++ b/startupscript/butane/devcontainer-failure-handler.sh @@ -29,6 +29,9 @@ echo "failed: $(date)" >> "${RETRY_FILE}" # Check if number of retries have exceeded maximum num_retries="$(wc -l < "${RETRY_FILE}")" if [[ "${num_retries}" -ge "${RETRY_COUNT}" ]]; then + # Stop the service + systemctl stop devcontainer.service + # Log failure source /home/core/metadata-utils.sh set_metadata "startup_script/status" "ERROR" @@ -36,8 +39,6 @@ if [[ "${num_retries}" -ge "${RETRY_COUNT}" ]]; then if [[ -z "${error_message}" ]]; then set_metadata "startup_script/message" "There was an error launching your custom container on the VM. Please try recreating the VM." fi - # Stop the service - systemctl stop devcontainer.service if [[ "$SHUTDOWN_ON_FAILURE" == "true" ]]; then # Sleep for a bit in case logs need to be captured