Skip to content

builder-upgrade: give cache clearing a long ssh timeout #92

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

builder-upgrade: give cache clearing a long ssh timeout #92

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
8 changes: 5 additions & 3 deletions orchestrator/orchestrator/builder_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def free_gb(h: BuilderHost) -> int:


def reclaimable_gb(h: BuilderHost) -> int:
out = _sh(h, "sudo -n du -sg /opt/worker/cache /opt/worker/tasks /Users/cltbld/caches 2>/dev/null | awk '{s+=$1} END{print s+0}'", check=False)
out = _sh(h, "sudo -n du -sg /opt/worker/cache /opt/worker/tasks /Users/cltbld/caches 2>/dev/null | awk '{s+=$1} END{print s+0}'", check=False, timeout=600)
return int(out or 0)


Expand Down Expand Up @@ -295,8 +295,10 @@ def step_clear_caches(h: BuilderHost) -> None:
staging dir, and the Xcode the previous run moved aside."""
ui.step("CLEAR CACHES", "worker cache + tasks, stale caches, leftover installer data")
before = free_gb(h)
_sh(h, "sudo sh -c 'rm -rf /opt/worker/cache/* /opt/worker/tasks/* && echo {} > /opt/worker/directory-caches.json'")
_sh(h, "sudo rm -rf /Users/cltbld/caches '/System/Volumes/Data/macOS Install Data' /Applications/Xcode.app.pre-*", check=False)
# Deleting ~20G of hg stores outlasts ssh.run's 120s default (r8-138, 2026-10-22): the rm
# finished on the host but the tool had already given up.
_sh(h, "sudo sh -c 'rm -rf /opt/worker/cache/* /opt/worker/tasks/* && echo {} > /opt/worker/directory-caches.json'", timeout=1800)
_sh(h, "sudo rm -rf /Users/cltbld/caches '/System/Volumes/Data/macOS Install Data' /Applications/Xcode.app.pre-*", check=False, timeout=1800)
ui.ok(f"{before}G -> {free_gb(h)}G free")


Expand Down
13 changes: 13 additions & 0 deletions orchestrator/tests/test_builder_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,19 @@ def test_stop_worker_fails_if_task_user_comes_straight_back():
bu.step_stop_worker(_host(), logout_wait=0)


def test_clear_caches_allows_a_long_rm():
timeouts = {}

def run(_h, command, *, stdin=None, check=True, timeout=None, user=None):
timeouts[command] = timeout
return _cp("90")

with patch("orchestrator.builder_upgrade.ssh.run", run):
bu.step_clear_caches(_host())
rm = [t for c, t in timeouts.items() if "rm -rf" in c]
assert rm and all(t and t >= 1800 for t in rm)


# --- os update ---


Expand Down
Loading