Skip to content

Revert "Protect state dir against concurrent operations" #249

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.

Sign up for GitHub

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
timwoj merged 3 commits into from
Aug 20, 2026
Merged

Revert "Protect state dir against concurrent operations" #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
facbc32
Revert "Protect state dir against concurrent operations"
bbannier Aug 20, 2026
30124bf
Update CI for Zeek now shipping a shiv-bundled zkg
bbannier Aug 20, 2026
7ae364e
Fix version canonifier to deal with multidigit versions
bbannier Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ jobs:
- name: Remove zkg installation
# Rule out confusion between test environment and pre-existing zkg:
run: |
rm $ZEEKROOT/bin/zkg $ZEEKROOT/share/man/man1/zkg.1
rm -r $ZEEKROOT/etc/zkg
rm -r $ZEEKROOT/lib/zeek/python/zeekpkg
rm -r $ZEEKROOT/var/lib/zkg
rm -f $ZEEKROOT/bin/zkg $ZEEKROOT/share/man/man1/zkg.1
rm -f -r $ZEEKROOT/etc/zkg
rm -f -r $ZEEKROOT/lib/zeek/python/zeekpkg
rm -f -r $ZEEKROOT/bin/zkg
rm -f -r $ZEEKROOT/var/lib/zkg
- uses: actions/checkout@v4

- name: Install uv
Expand Down
2 changes: 1 addition & 1 deletion testing/tests/bundle-unsatisfied-dependency
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# @TEST-EXEC: zkg unbundle bundle.tar >> output
# @TEST-EXEC: zkg list >> output
# @TEST-EXEC: btest-diff output
# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/[0-9]{2}/XX/g" | sed -r "s/\(.\..\..\)/(X.X.X)/g" | $SCRIPTS/diff-remove-abspath btest-diff' btest-diff .stderr
# @TEST-EXEC: TEST_DIFF_CANONIFIER='sed -r "s/\([0-9]+\.[0-9]+\.[0-9]+\)/(X.X.X)/g" | sed -r "s/[0-9]{2}/XX/g" | $SCRIPTS/diff-remove-abspath btest-diff' btest-diff .stderr
# @TEST-EXEC: btest-diff package.log
#

Expand Down
18 changes: 0 additions & 18 deletions testing/tests/concurrent-state-lock
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions zeekpkg/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import configparser
import copy
import fcntl
import filecmp
import json
import os
Expand Down Expand Up @@ -292,13 +291,7 @@ def __init__(
self.manifest = os.path.join(self.state_dir, "manifest.json")
self.autoload_script = os.path.join(self.script_dir, "packages.zeek")
self.autoload_package = os.path.join(self.script_dir, "__load__.zeek")

make_dir(self.state_dir)

# The lock file lives inside `state_dir`, so we open it after ensuring the dir exists.
self._state_lock = open(os.path.join(self.state_dir, ".lock"), "a")
fcntl.flock(self._state_lock, fcntl.LOCK_EX)

make_dir(self.log_dir)
make_dir(self.scratch_dir)
make_dir(self.source_clonedir)
Expand Down
Loading