Repository navigation
Keep cleanup runners coordinated through a stable lock file - #1160
Merged
mmguero merged 1 commit intoOct 7, 2026
Conversation
Signed-off-by: Sylvester Kaczmarek <16242628+sylvesterkaczmarek@users.noreply.github.com>
This was referenced Oct 6, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Fixes #1157.
Keep the lock inode in place after both successful and unsuccessful attempts. The prior finally block let a losing contender unlink a live lock, allowing another runner to acquire a new inode and execute concurrently.
The file descriptor still closes on every return or exception, releasing the kernel lock. The empty lock file now intentionally persists. Cleanup eligibility, retention limits and the cleanup callback are unchanged.
Testing
python -m pytest -q filebeat/tests/test_cleanup_lock.py7 focused tests passed; 5 fail on unchanged source. Coverage uses actual
fcntl.flockcalls, separate descriptors and a separate Python process, plus successful sequential runs and exception recovery. The cleanup callback is mocked or writes an isolated marker; no production log is removed.Tests ran on macOS with Python 3.12. Filebeat/container deployment testing was not run.
New-test formatting, syntax checks and
git diff --checkpass. No dependency, workflow or version changes.Thanks for taking a look.