mirror of
https://github.com/garrytan/gstack.git
synced 2026-11-17 13:44:32 +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
@@ -66,16 +66,18 @@ shift || true
|
||||
# changes and renames the whole file, and gstack-question-log starts a
|
||||
# background --derive after every append, so writers overlap: a shared temp
|
||||
# name made renames fail and an unlocked rewrite dropped a concurrent
|
||||
# --log-session. Writers hold a mkdir lock (<profile>.lock/, whose owner file
|
||||
# --log-session. Writers hold a lock directory (<profile>.lock/, whose owner file
|
||||
# names the holder's pid and a random token; release is ownership-checked)
|
||||
# from before their read until after their rename, and write a unique temp
|
||||
# file. A lock whose holder process is gone is taken over at once; one older
|
||||
# than 5 minutes is taken over even when its pid is alive, since no writer
|
||||
# runs that long and the pid may have been reused. Takeovers are serialized by a second mkdir lock
|
||||
# runs that long and the pid may have been reused. Takeovers are serialized by a second lock
|
||||
# (<profile>.lock.takeover/) and re-read the owner under it, so two waiters
|
||||
# cannot both take over or remove a lock a third writer just took. A lock or
|
||||
# takeover directory older than 30 s with no owner belongs to a writer that
|
||||
# died before writing one; cleanup removes a takeover lock this writer holds. A writer that cannot get the lock within the
|
||||
# died before writing one; cleanup removes a takeover lock this writer holds. Both locks
|
||||
# are taken with gstack_lock_take (bin/gstack-lock.sh): mkdir's exit status is not
|
||||
# a lock on Ubuntu 26.04's uutils mkdir, so the owner file is created with O_EXCL. A writer that cannot get the lock within the
|
||||
# give-up window writes nothing and exits 5. Writers outside this binary
|
||||
# (gstack-distill-apply, /plan-tune's declared edits) do not take it yet.
|
||||
# -----------------------------------------------------------------------
|
||||
@@ -87,7 +89,7 @@ PROFILE_TMP=""
|
||||
|
||||
cleanup() {
|
||||
if [ -n "$PROFILE_TMP" ]; then rm -f "$PROFILE_TMP"; fi
|
||||
if [ -n "$HOLDS_TAKEOVER" ]; then rmdir "$TAKEOVER_DIR" 2>/dev/null || true; fi
|
||||
if [ -n "$HOLDS_TAKEOVER" ]; then rm -rf "$TAKEOVER_DIR" 2>/dev/null || true; fi
|
||||
if [ -n "$LOCK_TOKEN" ] && [ "$(cat "$LOCK_DIR/owner" 2>/dev/null || true)" = "$LOCK_TOKEN" ]; then
|
||||
rm -rf "$LOCK_DIR"
|
||||
fi
|
||||
@@ -117,8 +119,9 @@ acquire_lock() {
|
||||
# GSTACK_PROFILE_LOCK_TIMEOUT_MS: test-only override for the give-up.
|
||||
local give_up_ms="${GSTACK_PROFILE_LOCK_TIMEOUT_MS:-10000}" waited_ms=0 started=$SECONDS vanished=0 owner
|
||||
local token="$$-$RANDOM$RANDOM"
|
||||
until mkdir "$LOCK_DIR" 2>/dev/null; do
|
||||
# mkdir failed with no lock to wait for: retry once in case a holder just
|
||||
. "$SCRIPT_DIR/gstack-lock.sh" 2>/dev/null || { echo "gstack-developer-profile: $SCRIPT_DIR/gstack-lock.sh is missing, so nothing was written (exit 5). fix: reinstall with ./setup or /gstack-upgrade" >&2; exit 5; }
|
||||
until gstack_lock_take "$LOCK_DIR" owner "$token"; do
|
||||
# The take failed with no lock to wait for: retry once in case a holder just
|
||||
# released it, then report the directory instead of waiting out the window.
|
||||
if [ ! -e "$LOCK_DIR" ]; then
|
||||
if [ "$vanished" -eq 0 ]; then vanished=1; continue; fi
|
||||
@@ -128,13 +131,13 @@ acquire_lock() {
|
||||
vanished=0
|
||||
owner=$(cat "$LOCK_DIR/owner" 2>/dev/null || true)
|
||||
if [ -d "$LOCK_DIR" ] && lock_abandoned "$owner"; then
|
||||
if [ -d "$TAKEOVER_DIR" ] && [ "$(dir_age_s "$TAKEOVER_DIR")" -gt 30 ]; then rmdir "$TAKEOVER_DIR" 2>/dev/null || true; fi
|
||||
if mkdir "$TAKEOVER_DIR" 2>/dev/null; then
|
||||
if [ -d "$TAKEOVER_DIR" ] && [ "$(dir_age_s "$TAKEOVER_DIR")" -gt 30 ]; then rm -rf "$TAKEOVER_DIR" 2>/dev/null || true; fi
|
||||
if gstack_lock_take "$TAKEOVER_DIR" pid "$$"; then
|
||||
HOLDS_TAKEOVER=1
|
||||
if [ "$(cat "$LOCK_DIR/owner" 2>/dev/null || true)" = "$owner" ] && lock_abandoned "$owner"; then
|
||||
rm -rf "$LOCK_DIR" 2>/dev/null || true
|
||||
fi
|
||||
rmdir "$TAKEOVER_DIR" 2>/dev/null || true
|
||||
rm -rf "$TAKEOVER_DIR" 2>/dev/null || true
|
||||
HOLDS_TAKEOVER=""
|
||||
if [ ! -e "$LOCK_DIR" ]; then continue; fi
|
||||
fi
|
||||
@@ -146,7 +149,6 @@ acquire_lock() {
|
||||
sleep 0.05
|
||||
waited_ms=$(( waited_ms + 50 ))
|
||||
done
|
||||
printf '%s\n' "$token" > "$LOCK_DIR/owner"
|
||||
LOCK_TOKEN="$token"
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user