df3d41ee67
Every git fetch that dies mid-transfer (timeout, HTTP 429, dropped line) strands a tmp_pack_* file in .git/objects/pack, and git never cleans them. The banner's background update check is the main generator on flaky lines — several aborted fetches a day — and the reporter's install accumulated hundreds of files / 6.0 GB over 9 days until the pack directory corrupted outright and every update check hung or failed permanently. clear_stale_tmp_packs() in gitlock.py sweeps tmp_pack_/tmp_idx_/ tmp_rev_/tmp_mtimes_ debris with the exact safety contract the lock sweep already uses: only files past the 10-minute age floor, never while any git process runs, never raises, real pack-*.pack/.idx files untouchable by construction (prefix match). Wired into all three fetch-adjacent sites: _cmd_update_check, the update apply path, and the banner's passive check (generator = janitor). Live E2E: 300 aged tmp_pack files (the reported scale-shape) swept from a real repo; an in-flight fresh tmp and ancient real packs survived; fsck clean and a real fetch round-trip succeeded after.
102 lines
3.1 KiB
Python
102 lines
3.1 KiB
Python
"""Aborted-fetch tmp_pack debris sweep (#93732, campaign #91277).
|
|
|
|
Every git fetch that dies mid-transfer strands a tmp_pack_* file in
|
|
.git/objects/pack; git never cleans them. clear_stale_tmp_packs() removes
|
|
them with the same age + live-git-process safety contract the lock sweep
|
|
uses.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import time
|
|
from pathlib import Path
|
|
|
|
from hermes_cli.gitlock import (
|
|
STALE_TMP_PACK_MIN_AGE_SECONDS,
|
|
clear_stale_tmp_packs,
|
|
)
|
|
|
|
|
|
def _mkrepo(tmp_path: Path) -> Path:
|
|
pack = tmp_path / ".git" / "objects" / "pack"
|
|
pack.mkdir(parents=True)
|
|
return tmp_path
|
|
|
|
|
|
def _age(path: Path, seconds: float) -> None:
|
|
stamp = time.time() - seconds
|
|
os.utime(path, (stamp, stamp))
|
|
|
|
|
|
def test_removes_old_tmp_pack_debris(tmp_path, monkeypatch):
|
|
repo = _mkrepo(tmp_path)
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: False)
|
|
pack = repo / ".git" / "objects" / "pack"
|
|
|
|
debris = []
|
|
for name in ("tmp_pack_AbCd12", "tmp_idx_XyZ", "tmp_rev_Q1", "tmp_mtimes_M8"):
|
|
p = pack / name
|
|
p.write_bytes(b"x" * 128)
|
|
_age(p, STALE_TMP_PACK_MIN_AGE_SECONDS + 60)
|
|
debris.append(p)
|
|
|
|
removed = clear_stale_tmp_packs(repo)
|
|
assert len(removed) == 4
|
|
for p in debris:
|
|
assert not p.exists()
|
|
|
|
|
|
def test_spares_fresh_debris_and_real_packs(tmp_path, monkeypatch):
|
|
repo = _mkrepo(tmp_path)
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: False)
|
|
pack = repo / ".git" / "objects" / "pack"
|
|
|
|
fresh = pack / "tmp_pack_fresh" # a fetch may be writing this NOW
|
|
fresh.write_bytes(b"y")
|
|
real_pack = pack / "pack-abc123.pack" # real object data — never touch
|
|
real_pack.write_bytes(b"z" * 64)
|
|
real_idx = pack / "pack-abc123.idx"
|
|
real_idx.write_bytes(b"z")
|
|
_age(real_pack, 10 * 24 * 3600) # even when ancient
|
|
_age(real_idx, 10 * 24 * 3600)
|
|
|
|
removed = clear_stale_tmp_packs(repo)
|
|
assert removed == []
|
|
assert fresh.exists() and real_pack.exists() and real_idx.exists()
|
|
|
|
|
|
def test_skips_sweep_while_git_is_running(tmp_path, monkeypatch):
|
|
repo = _mkrepo(tmp_path)
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: True)
|
|
pack = repo / ".git" / "objects" / "pack"
|
|
p = pack / "tmp_pack_old"
|
|
p.write_bytes(b"x")
|
|
_age(p, STALE_TMP_PACK_MIN_AGE_SECONDS + 60)
|
|
|
|
assert clear_stale_tmp_packs(repo) == []
|
|
assert p.exists()
|
|
|
|
|
|
def test_no_git_dir_is_a_noop(tmp_path):
|
|
assert clear_stale_tmp_packs(tmp_path) == []
|
|
|
|
|
|
def test_never_raises_on_unlink_failure(tmp_path, monkeypatch):
|
|
repo = _mkrepo(tmp_path)
|
|
monkeypatch.setattr("hermes_cli.gitlock._git_proc_running", lambda: False)
|
|
pack = repo / ".git" / "objects" / "pack"
|
|
p = pack / "tmp_pack_stuck"
|
|
p.write_bytes(b"x")
|
|
_age(p, STALE_TMP_PACK_MIN_AGE_SECONDS + 60)
|
|
|
|
real_unlink = Path.unlink
|
|
|
|
def failing_unlink(self, *a, **k):
|
|
if self.name == "tmp_pack_stuck":
|
|
raise OSError(13, "Permission denied")
|
|
return real_unlink(self, *a, **k)
|
|
|
|
monkeypatch.setattr(Path, "unlink", failing_unlink)
|
|
assert clear_stale_tmp_packs(repo) == [] # skipped, not raised
|