-
Notifications
You must be signed in to change notification settings - Fork 280
harden: lock episodic writes + fix pi install.sh silent orphan #19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| """Cross-platform locked append for episodic JSONL writes. | ||
|
|
||
| POSIX `write(2)` in O_APPEND mode is atomic for payloads up to PIPE_BUF | ||
| (4 KB on Linux, 512 B minimum per POSIX). Most episodic entries fit, | ||
| but failure entries with reflection + context + detail can exceed that, | ||
| and two harness hooks writing from the same process (or from two Pi | ||
| sessions on the same repo) can interleave bytes mid-line. Silent | ||
| corruption is worse than a visible error because every downstream | ||
| reader (`auto_dream.py`, `cluster.py`, `context_budget.py`, | ||
| `show.py`) skips `JSONDecodeError` lines without surfacing the loss. | ||
|
|
||
| This module serializes appends with `fcntl.flock(LOCK_EX)` on POSIX. | ||
| On platforms without `fcntl` (native Windows Python) the lock is a | ||
| no-op and behavior matches the pre-lock baseline. WSL, git-bash via | ||
| Cygwin, macOS, and Linux all provide `fcntl`. | ||
| """ | ||
| import json | ||
| import os | ||
|
|
||
| try: | ||
| import fcntl # POSIX | ||
| _HAVE_FLOCK = True | ||
| except ImportError: | ||
| _HAVE_FLOCK = False | ||
|
|
||
|
|
||
| def append_jsonl(path: str, entry: dict) -> dict: | ||
| """Serialize `entry` to one JSON line and append to `path`. | ||
|
|
||
| Uses `open(..., "ab")` (append-binary) to bypass Python's text-mode | ||
| buffering and guarantee a single `write(2)` per call. `fcntl.flock` | ||
| provides cross-process mutual exclusion on POSIX. | ||
| """ | ||
| payload = (json.dumps(entry) + "\n").encode("utf-8") | ||
| os.makedirs(os.path.dirname(path), exist_ok=True) | ||
| with open(path, "ab") as f: | ||
| if _HAVE_FLOCK: | ||
| fcntl.flock(f.fileno(), fcntl.LOCK_EX) | ||
| try: | ||
| f.write(payload) | ||
| f.flush() | ||
| finally: | ||
| if _HAVE_FLOCK: | ||
| fcntl.flock(f.fileno(), fcntl.LOCK_UN) | ||
| return entry | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
append_jsonlonly falls back whenfcntlis missing, butfcntl.flock(...)can still raiseOSErroron filesystems that do not support advisory locks (for example, some network or virtual mounts). In that case bothlog_executionandon_failurewill raise and can abort the hook path instead of just recording without locking, which is a regression from the previous append-only behavior.Useful? React with 👍 / 👎.