mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-17 21:54:30 +01:00
Make gstack's shell locks hold when mkdir reports a race it lost (GST-2247) (#4262)
* Make gstack's shell locks hold when mkdir reports a race it lost (GST-2247) Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * Fix lock tests and fixtures for gstack_lock_take; trim setup-gbrain lock prose Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * Ship the lock helper with every copied runtime and fixture that runs a lock The Claude Code wrapper's copied runtime now includes bin/gstack-lock.sh, and bin/gstack-render-claude.sh sources it beside itself, so gstack-config set works in a copied runtime and the render lock is taken by every caller. Test fixtures that copy single bin scripts now copy the helper too, and the mkdir lock guard is registered as a repo-wide docs reader. Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * Release a lock whose owner file could not be fully written gstack_lock_take created the owner file with a noclobber redirect and, when that redirect failed, treated an existing file as a competing holder. If the file was created but the write then failed (disk full, quota, ulimit -f), the helper found its own empty file, returned 1 and left a lock nobody held; freeze's state lock has no stale recovery, so it stayed busy until removed by hand. The helper now tells "opened but write failed" from "already held", removes its own file and directory, and returns 3. The inline copy in gstack-ff-update is updated byte for byte, and a new test under ulimit -f 0 fails on the old helper. Review-Finding: s11/outside-voice#1 reader=outside-voice Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> * Describe the lease lock as gstack_lock_take's O_EXCL owner file Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com> --------- Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
76fad3edd9
commit
bcece3fbcd
50 files changed
+621
-154
No files matched your search
@@ -47,8 +47,10 @@
|
||||
# treated as an owned legacy stray.
|
||||
#
|
||||
# Mutation safety:
|
||||
# - every mutation runs under a mkdir lock (<settings>.lock/) with an owner
|
||||
# token; release is ownership-checked; stale locks (>30s) are taken over
|
||||
# - every mutation runs under a lock directory (<settings>.lock/) whose owner
|
||||
# token file is created with O_EXCL (gstack_lock_take, bin/gstack-lock.sh;
|
||||
# mkdir's exit status is not a lock on Ubuntu 26.04's uutils mkdir);
|
||||
# release is ownership-checked; stale locks (>30s) are taken over
|
||||
# via atomic rename. On lock give-up the mutation is SKIPPED with a warning
|
||||
# (the next setup retries — the system is convergent).
|
||||
# - parse failure fails CLOSED: a corrupt settings.json is never overwritten
|
||||
@@ -353,18 +355,18 @@ _acquire_lock() {
|
||||
local stale_after_s=30 # lock older than this belongs to a crashed holder
|
||||
local poll_ms=50 # retry cadence; sleep below derives from this
|
||||
token="$$-$RANDOM$RANDOM"
|
||||
. "$(cd "$(dirname "$0")" && pwd)/gstack-lock.sh" 2>/dev/null || { echo "gstack-settings-hook: $(dirname "$0")/gstack-lock.sh is missing -- skipping this mutation, exit 5 (fix: reinstall with ./setup)" >&2; return 1; }
|
||||
while :; do
|
||||
if mkdir "$_LOCK_DIR" 2>/dev/null; then
|
||||
printf '%s\n' "$token" > "$_LOCK_DIR/owner" 2>/dev/null || true
|
||||
if gstack_lock_take "$_LOCK_DIR" owner "$token"; then
|
||||
_LOCK_TOKEN="$token"
|
||||
trap _release_lock EXIT
|
||||
trap 'exit 129' INT
|
||||
trap 'exit 143' TERM
|
||||
return 0
|
||||
fi
|
||||
# mkdir failed but no lock dir exists: either a holder released between
|
||||
# our mkdir and this check, or NOT contention (unwritable parent, read-only
|
||||
# fs, missing directory). Retry mkdir once; a second failure with still no
|
||||
# The take failed but no lock dir exists: either a holder released between
|
||||
# our take and this check, or NOT contention (unwritable parent, read-only
|
||||
# fs, missing directory). Retry the take once; a second failure with still no
|
||||
# lock dir is the environment, and waiting cannot help, so give up loudly
|
||||
# now instead of spinning out the full timeout.
|
||||
if [ ! -e "$_LOCK_DIR" ]; then
|
||||
|
||||
Reference in new issue
Block a user