From d40fbfaac3f403861efd29db5531ea1ae9060848 Mon Sep 17 00:00:00 2001
From: rob <rob@stakesquid.eu>
Date: Wed, 15 Jul 2026 06:49:39 +0000
Subject: [PATCH] reload_dshackle.sh: detect-and-restart on SIGHUP reload
 failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

dshackle's SIGHUP reload silently fails for upstream REMOVALS (and method-set
changes, same remove+add path): it logs "Config is not reloaded, cause - ...",
updates the in-memory config but leaves runtime selectors stale (drift), and keeps
serving the old config. No runtime admin API exists to mutate upstreams, so a
container restart is the only way to actually apply such changes.

Replace the blind SIGHUP with: per-container SIGHUP, then check post-SIGHUP logs
for the failure marker ("Config is not reloaded, cause -") or a dropped concurrent
HUP ("Reloading is in progress"); on either, docker restart to load config fresh.
"Reloading config has been completed" is NOT success (finally-block) — deliberately
not treated as such. Exit 0 when config ends up applied (via SIGHUP or restart);
non-zero only if a needed restart fails or the container doesn't come back.

Layered on top of the override-weave (apply-dshackle-overrides.py) and the 1:1
invariant gate (validate-dshackle-1to1.py) — both run unchanged before the reload.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 reload_dshackle.sh | 57 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/reload_dshackle.sh b/reload_dshackle.sh
index eb4d0f44..217bdd36 100755
--- a/reload_dshackle.sh
+++ b/reload_dshackle.sh
@@ -17,5 +17,58 @@ if [ -f /root/rpc/validate-dshackle-1to1.py ]; then
   }
 fi
 
-docker ps -q -f "name=dshackle" | xargs -r docker kill --signal=HUP
-docker ps -q -f "name=dshackle-free" | xargs -r docker kill --signal=HUP
+# Signal dshackle to reload, then VERIFY the reload applied. dshackle's SIGHUP reload is
+# unreliable for upstream REMOVALS (and method-set changes, same remove+add path): it can
+# throw internally, log "Config is not reloaded, cause - ...", and SILENTLY keep serving the
+# old config (in-memory config updated, runtime selectors stale = drift). Note
+# "Reloading config has been completed" is NOT success — it's a finally-block and prints even
+# when a processor threw. There is no runtime admin API to mutate upstreams, so a container
+# restart is the only way to actually apply such changes.
+# Per container: SIGHUP, check the post-SIGHUP logs for a failure/drop marker, restart on
+# failure. Exit 0 when the config ends up applied (via SIGHUP or restart); non-zero only if a
+# needed restart failed or the container didn't come back (so the deploy fails loudly instead
+# of silently drifting).
+set -u
+FAIL_MARK='Config is not reloaded, cause -'   # a reload processor threw (removal/method bug)
+DROP_MARK='Reloading is in progress'          # a concurrent HUP was dropped (reload skipped)
+SETTLE=3                                      # seconds for the SIGHUP handler to run + log
+RC=0
+
+for CID in $(docker ps -q -f "name=dshackle"); do
+  NAME=$(docker inspect -f '{{.Name}}' "$CID" 2>/dev/null | sed 's|^/||')
+  [ -n "$NAME" ] || NAME="$CID"
+  T0=$(date +%s)
+  if ! docker kill --signal=HUP "$CID" >/dev/null 2>&1; then
+    echo "reload_dshackle: WARNING: failed to SIGHUP $NAME" >&2
+    RC=1
+    continue
+  fi
+  sleep "$SETTLE"
+  LOGS=$(docker logs --since "$T0" "$CID" 2>&1)
+  REASON=""
+  if echo "$LOGS" | grep -qF "$FAIL_MARK"; then
+    REASON=$(echo "$LOGS" | grep -F "$FAIL_MARK" | head -1)
+  elif echo "$LOGS" | grep -qF "$DROP_MARK"; then
+    REASON="concurrent HUP dropped (reload skipped)"
+  fi
+  [ -z "$REASON" ] && continue                  # SIGHUP applied the config — done
+  echo "reload_dshackle: $NAME reload did NOT apply ($REASON) — restarting to load config fresh" >&2
+  if ! docker restart "$CID" >/dev/null 2>&1; then
+    echo "reload_dshackle: ERROR: restart failed for $NAME — config NOT applied, manual intervention" >&2
+    RC=1
+    continue
+  fi
+  UP=""
+  for _ in $(seq 1 30); do
+    if docker inspect -f '{{.State.Running}}' "$CID" 2>/dev/null | grep -q true; then UP=1; break; fi
+    sleep 2
+  done
+  if [ -n "$UP" ]; then
+    echo "reload_dshackle: $NAME restarted, config applied on clean start" >&2
+  else
+    echo "reload_dshackle: ERROR: $NAME not running after restart — manual intervention" >&2
+    RC=1
+  fi
+done
+
+exit $RC