fix: recover stalled update requests

scripts/test-update-fixture.sh

@@ -26,18 +26,35 @@ for version in 01.2.3 1.02.3 1.2.03 1.2.3-01 1.2.3-alpha..1; do
 done
 
 missing_service_user="kaidi-fixture-missing-$$"
+mkdir -p "$WORK/bootstrap/app" "$WORK/bootstrap/state/inbox" \
+  "$WORK/bootstrap/state/processing" "$WORK/bootstrap/state/failed" "$WORK/bootstrap/log" \
+  "$WORK/bootstrap/bin"
+cat > "$WORK/bootstrap/bin/flock" <<'SH'
+#!/bin/sh
+exit 0
+SH
+chmod 0755 "$WORK/bootstrap/bin/flock"
+jq -n \
+  '{action:"DOWNLOAD",version:"1.0.0-preview.2",reason:"bootstrap fixture"}' \
+  > "$WORK/bootstrap/state/inbox/request.json"
 if KAIDI_APP_ROOT="$WORK/bootstrap/app" \
   KAIDI_UPDATE_STATE_ROOT="$WORK/bootstrap/state" \
   KAIDI_LOG_ROOT="$WORK/bootstrap/log" \
   KAIDI_SERVICE_USER="$missing_service_user" \
   KAIDI_SERVICE_GROUP="$missing_service_user" \
+  PATH="$WORK/bootstrap/bin:$PATH" \
   sh "$ROOT/deploy/update.sh" > "$WORK/bootstrap.log" 2>&1; then
   fail 'updater accepted a missing service identity during bootstrap'
 fi
 grep -Fq "Service user $missing_service_user is missing" "$WORK/bootstrap.log" \
   || fail 'updater bootstrap failure did not preserve its diagnostic'
-! grep -Eq 'No such file|nonexistent directory|cannot create' "$WORK/bootstrap.log" \
-  || fail 'updater bootstrap failure was masked by an unavailable status directory'
+[ "$(jq -r '.state' "$WORK/bootstrap/state/status.json")" = FAILED ] \
+  || fail 'updater bootstrap failure did not persist FAILED'
+[ ! -e "$WORK/bootstrap/state/inbox/request.json" ] \
+  && [ ! -e "$WORK/bootstrap/state/processing/request.json" ] \
+  || fail 'updater bootstrap failure left a request permanently queued'
+find "$WORK/bootstrap/state/failed" -type f -name 'request-*.json' -print -quit | grep -q . \
+  || fail 'updater bootstrap failure did not archive the claimed request'
 
 write_mock_commands() {
   local mock_bin=$1