harness v0.8: rust shared CARGO_TARGET_DIR, disk guard + reclaim, disk logging

scripts/verify.py

@@ -1,4 +1,4 @@
-"""PatchBench row verification + context expansion harness (v0.7).
+"""PatchBench row verification + context expansion harness (v0.8).
 
 For each candidate row:
   1. clone the repo at base_commit
@@ -22,11 +22,16 @@ Native (non-Docker) reproduction of the upstream env:
     reports/<lang>-test-results.json`; the row's print_cmds list is often empty)
   - JS/TS: if package.json exists without node_modules, deps are installed with the
     repo's own package manager (detected from lockfile)
-  - rust: cargo target dirs are wiped between rows to stay inside the ephemeral
-    storage quota
+  - rust: cargo target dirs are wiped between rows AND all builds go to one shared
+    CARGO_TARGET_DIR outside the repo, so disk usage is monitorable and reclaimable
 
 v0.7: TimeoutExpired.stdout/stderr can be bytes (python quirk under capture_output) --
 decode before concatenating. This crashed slow maven builds at the 2100s timeout.
+v0.8: disk guard. Three rust jobs died on the 50G ephemeral-storage quota mid-row.
+Now: shared CARGO_TARGET_DIR, a check before every test phase that wipes build
+caches when free space < 6G (raising "disk_pressure" instead of getting the pod
+evicted, which loses every remaining row), and df/du logging after each phase so
+the next quota failure is diagnosable from the log.
 
 Usage (inside a job with the right language toolchain image):
   python verify.py --lang go --file pilot/candidates/go.jsonl --limit 6
@@ -38,6 +43,9 @@ CACHE = "/tmp/cache/repos"
 CMD_TIMEOUT_S = 2100
 GIT_TIMEOUT_S = 900
 MAX_CONTEXT_LINES = 1500
+DISK_FREE_MIN_BYTES = 6 * 1024**3   # reclaim below this
+DISK_ABORT_BYTES = 2 * 1024**3      # abort row below this after reclaim
+RUST_SHARED_TARGET = "/tmp/pb-cargo-target"
 
 LANG_PATH_PREPEND = {
     "go": ["/usr/local/go/bin"],
@@ -76,6 +84,36 @@ def sh(cmds, cwd, timeout=CMD_TIMEOUT_S):
     return True, ""
 
 
+def free_bytes(path="/tmp"):
+    try:
+        st = os.statvfs(path)
+        return st.f_bavail * st.f_frsize
+    except OSError:
+        return 1 << 62
+
+
+def log_disk(tag):
+    _, out, _ = run("df -h /tmp 2>/dev/null | tail -n +2; "
+                    "du -sh /tmp/pb-cargo-target /tmp/cache /usr/local/cargo/registry 2>/dev/null",
+                    "/tmp", 120)
+    print(f"[disk:{tag}] free={free_bytes() >> 30}G | {out.strip()[:400]}", flush=True)
+
+
+def reclaim_disk():
+    """Wipe build artifacts (not .git clones, not the registry) to free space."""
+    run("rm -rf /tmp/pb-cargo-target", "/tmp", 600)
+
+
+def disk_guard(tag):
+    """Raise instead of letting the pod get evicted -- an eviction loses all rows."""
+    if free_bytes() < DISK_FREE_MIN_BYTES:
+        print(f"[disk:{tag}] low, reclaiming shared target dir", flush=True)
+        reclaim_disk()
+    if free_bytes() < DISK_ABORT_BYTES:
+        raise RuntimeError(f"disk_pressure: only {free_bytes() >> 30}G free after reclaim "
+                           f"(tag={tag}); aborting row to save the remaining rows")
+
+
 def apply_patch(text, cwd):
     pf = os.path.join(cwd, ".pb_patch")
     with open(pf, "w") as f:
@@ -92,8 +130,8 @@ def apply_patch(text, cwd):
 def clean_state(repo_dir, lang=None):
     run("git checkout -f HEAD -- . && git clean -fdxq", repo_dir, 120)
     if lang == "rust":
-        # cargo target dirs can be 10-30GB per repo; the job has 50G ephemeral storage
         run("find . -name target -type d -prune -exec rm -rf {} +", repo_dir, 300)
+        run(f"rm -rf {RUST_SHARED_TARGET}", "/tmp", 300)
 
 
 def get_parser(row):
@@ -124,9 +162,10 @@ def ensure_js_deps(repo_dir):
     return None if ok else f"js deps install failed: {err}"
 
 
-def run_tests(row, repo_dir, lang):
+def run_tests(row, repo_dir, lang, phase_tag=""):
     """Run rebuild_cmds, test_cmds, print_cmds, then surface any reports/* the test
     commands wrote. Returns (tests_dict, combined_output_tail)."""
+    disk_guard(f"{phase_tag}-pre")
     parser = get_parser(row)
     dep_err = ensure_js_deps(repo_dir)
     sh(row.get("rebuild_cmds"), repo_dir)
@@ -142,6 +181,7 @@ def run_tests(row, repo_dir, lang):
         out += o + "\n"
     _, o, _ = run("for f in reports/*; do [ -f \"$f\" ] && cat \"$f\"; done", repo_dir, 120)
     out += o + "\n"
+    log_disk(f"{phase_tag}-post")
     return parser(out), out[-3000:]
 
 
@@ -226,7 +266,10 @@ def verify_row(row, lang):
         if rc != 0:
             rec["error"] = f"checkout failed: {out[-500:]}"
             return rec
+    log_disk(f"cloned:{row['id']}")
 
+    if lang == "rust":
+        os.environ["CARGO_TARGET_DIR"] = RUST_SHARED_TARGET
     os.environ["PATH"] = ":".join(LANG_PATH_PREPEND.get(lang, [])) + ":" + os.environ["PATH"]
     def tb(cmds):
         return [c.replace(TESTBED, repo_dir) for c in (cmds or [])]
@@ -244,7 +287,7 @@ def verify_row(row, lang):
     pre_runs = []
     for i in range(2):
         s = time.time()
-        tests, tail = run_tests(row, repo_dir, lang)
+        tests, tail = run_tests(row, repo_dir, lang, f"pre{i}:{row['id']}")
         pre_runs.append((tests, tail))
         rec["timing"][f"pre_test_{i}"] = round(time.time() - s, 1)
     pre_detail = grade(pre_runs[0][0], row["fail_to_pass"], "fail", allow_missing=True)[1]
@@ -269,7 +312,7 @@ def verify_row(row, lang):
     post_runs = []
     for i in range(2):
         s = time.time()
-        tests, tail = run_tests(row, repo_dir, lang)
+        tests, tail = run_tests(row, repo_dir, lang, f"post{i}:{row['id']}")
         post_runs.append((tests, tail))
         rec["timing"][f"post_test_{i}"] = round(time.time() - s, 1)
     f2p_ok_post = all(grade(t, row["fail_to_pass"], "pass")[0] for t, _ in post_runs)