Skip to content

deploy: keep recycled distfiles on the distfiles filesystem #338

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
Zakkaus merged 1 commit into from
Oct 9, 2026
Merged

deploy: keep recycled distfiles on the distfiles filesystem #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion deploy/audit-distfiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ def scan(overlay, aux=None):

GRACE_SECONDS = 7 * 24 * 3600
STATE = os.environ.get("ORPHAN_STATE", "/var/lib/emirrordist/orphans.json")
RECYCLE = os.environ.get("RECYCLE", "/var/lib/emirrordist/recycle")
# Same filesystem as the public distfiles, so recycling is a rename, not a copy.
RECYCLE = os.environ.get("RECYCLE", "/srv/.emirrordist-recycle")
RECYCLE_RETENTION_SECONDS = 14 * 24 * 3600
MAX_REAP_SHARE = 1 / 3
MIN_RESTRICTED_TO_DOUBT = 20
Expand Down
4 changes: 2 additions & 2 deletions tests/test-audit-distfiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ def case(name, fn):
CASES.append((name, fn))


case("孤儿状态、回收目录与清理账本的预设路径不变", lambda: (
case("孤儿状态、回收目录与清理账本的预设路径", lambda: (
lambda fresh: (
fresh.STATE == "/var/lib/emirrordist/orphans.json"
and fresh.RECYCLE == "/var/lib/emirrordist/recycle"
and fresh.RECYCLE == "/srv/.emirrordist-recycle"
and fresh.LEDGER == "/var/lib/emirrordist/reaped.json"
)
)(load_audit_with_env({})))
Expand Down
Loading