worktree: isolate concurrent runs#16
Conversation
| /// present, so the worktree dirs don't show up as untracked in | ||
| /// `git status` of the main checkout. | ||
| pub fn sweep_stale(main_repo: &Path, command_label: &str, dest: &VerboseDest) -> Result<()> { | ||
| pub fn sweep_stale(main_repo: &Path, _command_label: &str, dest: &VerboseDest) -> Result<()> { |
There was a problem hiding this comment.
I think we're not properly cleaning stale worktrees now, sweep_stale() only runs git worktree prune, which removes registry entries only when their directories are already missing. In case of a crash/SIGKILL the worktree directory still exists. Can you check if that's the case / fix this? Thanks.
|
Can you add your Signed-off-by line to the commit message? Thanks. |
nirmoy
left a comment
nirmoy
left a comment
There was a problem hiding this comment.
Two cleanup regressions need addressing.
-
sweep_stale()atsrc/worktree.rs:146-159now leaves every existing directory and only runsgit worktree prune --expire=now. Prune retains registered worktrees whose directories still exist, exactly the state left by SIGKILL, a host crash, or failed Drop cleanup. Repeated interrupted build/test runs can therefore retain full worktrees and large in-tree build artifacts indefinitely. A shell reproducer confirmed the worktree remained both present and registered after the new sweep. -
The new layout creates
<command>/<run-id>/<sha>, but Drop removes only the<sha>worktree. Neither Drop nor the revised sweep removes the empty run-ID parent, so every successful boro invocation leaves one directory behind. A normal create/drop reproducer left the parent present.
Please introduce a safe ownership/liveness mechanism for stale run cleanup (for example, a per-run lease/lock plus conservative stale detection), remove empty run parents after successful cleanup, and cover both crash-orphan and normal-drop behavior with tests. Do not reintroduce deletion of another live process's worktree.
Also add the mandatory Signed-off-by trailer.
The three new worktree tests and current CI pass, but they currently assert preservation without covering eventual stale reclamation.
Generated worktrees live under per-run paths so two invocations of the same command can review or test the same commit without sharing a checkout. Startup cleanup still has to reclaim leftovers from SIGKILL, host crashes, or failed Drop cleanup: git worktree prune only removes registry entries when the worktree directory is already missing, so registered directories with build artifacts can otherwise accumulate indefinitely. Add a per-run lease file that is locked while the owner is alive. sweep_stale removes only run directories whose lease can be acquired, leaving live locked runs and unknown no-lock directories alone. Normal Drop cleanup now removes the empty run parent after the last worktree goes away, while crash-orphaned registered worktrees are reclaimed by the next sweep. Signed-off-by: Minh Vu <vuhoangminh97@gmail.com>
fallintoplace
force-pushed
the
fix/isolate-worktree-runs
branch
from
c99fd51 to
6c719cf
Compare
3 participants
Summary
<command>/<sha>paths.Testing