mirror of
https://github.com/stablyai/orca.git
synced 2026-09-23 00:02:29 +00:00
* perf(git): pack the loose refs Orca's own fetches leave behind Orca strips git's auto-maintenance off every fetch it issues (GIT_FETCH_SKIP_AUTO_MAINTENANCE_CONFIG_ARGS) and never compensated, so nothing in an Orca-driven checkout ever packs refs. One real machine reached 36,574 loose refs, where `git show-ref -- main` costs 5.2s and every worktree create pays for it. Add an idle-time, per-repo `git pack-refs --all --prune`, armed by the fetches that create the debt. It runs only after ten minutes of quiet on that repo, only above 1000 loose refs (probed with a walk bounded by that threshold, not by the backlog), one at a time across the whole app, at the background admission tier, and never while an agent is working, a create is prepared or in flight, a worktree removal is deleting refs, the app is quitting, or the machine is on battery. A user who set `maintenance.auto=false` or `gc.auto=0` has opted out. Measured on a 36,001-loose-ref fixture (macOS/APFS, git 2.44): `show-ref` 5.5-12.2s -> 30-49ms, `for-each-ref` 4.0-10.8s -> 43-48ms. Also fixes a pre-existing bug the split exposed: `--path-format=absolute` is ignored before git 2.31, and taking rev-parse's stdout raw collapsed every repo on such a host onto one fetch-serialization key. Refs #17828 * perf(git): make idle ref maintenance preemptible and cheaper to probe The idle veto was one-directional: it stopped a pack from starting during a create, removal, or agent work, but nothing stopped those from starting during a pack. A user-clicked Fetch, a branch delete, or a worktree removal that needed `packed-refs.lock` mid-rewrite could fail with `unable to create packed-refs.lock` -- a git error with no visible cause. Make the pack cancellable end to end. An AbortSignal now reaches the `pack-refs` child and both pre-pack probes, and `pause()` aborts what is running, waits for it to actually stop, and holds a suspension count so nothing new starts until the caller releases. Every entry point that deletes a ref takes that pause: gitFetch, gitPull, gitFastForward, removeWorktree, forceDeleteLocalBranch, prepareWorktreeCreateCheckout, addWorktree. Five more triggers close the rest of the window: battery drop, window focus, quit, the attempt deadline, and any other git command queueing for an admission slot. Judge a pack by re-probing the backlog rather than by the child's exit code. Measured in the field: another Orca session moved a branch mid-pack, git reported `cannot lock ref`, skipped that ref and packed the rest -- 36,688 loose refs down to 3. On a machine running several sessions that is the normal case, and retrying it would be wrong. Probe with one batched `readdir` per directory instead of streaming `opendir`, which issues a thread-pool round trip every 32 entries: 177ms -> 23ms on a real 36,600-ref repository, with half the event-loop lag. The walk stays strictly sequential so it can never occupy more than one of libuv's four filesystem threads. `PackRefsLockOwnership` makes a lock left by SIGKILL attributable, and only reclaims one when a marker exists, the lock is older than any pack-refs could run for, and the recorded process is gone. Refs #17828 * fix(git): wait out the packed-refs lock instead of killing the pack Measured on Git 2.55/APFS with 37k loose refs: a full `pack-refs --all --prune` takes 23-32s but holds `packed-refs.lock` for only 0.03-1.37s of it. The other ~95% is the prune phase, during which a concurrent `fetch --prune`, `branch -D` or `update-ref` succeeds every time -- per-ref locks last microseconds and git retries for `core.filesRefLockTimeout`. So the abort-on-everything design was strictly harmful. SIGTERM into the prune loop strands an empty `refs/**/*.lock` about one time in five (9/30, 5/40, 6/30 kills): `tempfile.c` opens the lock O_EXCL before `activate_tempfile()` links it into the list the signal handler walks, and a pack does ~36k lock cycles. Afterwards `update-ref -d` on that ref fails with `cannot lock ref ... File exists`, permanently. On Windows `taskkill /f` never runs git's handlers at all, so an abort inside the rewrite strands `packed-refs.lock` every time. Never signal the child. `packRefs` no longer takes an abort signal; it polls `packed-refs.lock` and reports the window through a `PackedRefsLockReporter`. `pause()` resolves when the lock is released -- bounded, and free during the prune -- while the suspension counter still blocks new attempts. Battery and window-focus become do-not-start rather than stop-what-is-running, and quit waits for the lock and lets the child finish orphaned. For strands that already exist, `PackRefsLockOwnership` now also reclaims `refs/**/*.lock` under the same three conditions plus a 0-byte check, and a lock carrying our own not-yet-reclaimable marker records `locked` with a 30min retry instead of the 6h failure cooldown -- so a Windows strand self-heals in half an hour rather than six. Reverts the git admission-scheduler event bus, which existed only to drive the abort this removes. Refs #17828 * test(git): make the ref-maintenance waits survive a loaded runner CI shard 4/8 failed on `restarts every armed countdown when the user does ref work themselves`, which passes locally. The `until()` helper spun a fixed 200 event-loop turns and then returned silently, so on a contended runner the filesystem probe had not finished and the assertion that followed failed with an unrelated message. Bound the wait by wall clock instead and throw a named error, which immediately exposed a second latent bug: the single-flight test's second wait could never succeed, because the deferred repo's retry is on a faked `setTimeout` that spinning the real loop never advances. It had been passing only because the old helper gave up quietly. Add a timer-aware variant for those, and have the countdown test await a signal the fake pack resolves rather than polling at all. Verified stable across five sequential runs and once under load average 32 with six concurrent suites. Refs #17828
81 lines
2.9 KiB
TypeScript
81 lines
2.9 KiB
TypeScript
import { readdir } from 'node:fs/promises'
|
|
import { join } from 'node:path'
|
|
|
|
export type LooseRefCount = {
|
|
/** Loose ref files seen, never above `budget`. */
|
|
count: number
|
|
/** The walk stopped early, so `count` is a floor rather than the total. */
|
|
saturated: boolean
|
|
}
|
|
|
|
// Why: a ref tree is shallow and wide; this bounds both the directories visited
|
|
// and the queue holding those still to visit, so neither a symlink loop nor a
|
|
// pathological repo turns a gate probe into an unbounded walk.
|
|
const DIRECTORY_VISIT_CEILING = 4096
|
|
|
|
/**
|
|
* Count loose refs under a repository's `refs/` directory, stopping at `budget`.
|
|
*
|
|
* Deliberately budgeted: callers use this as an admission gate, so the cost has
|
|
* to be bounded by the threshold being tested and not by the size of the
|
|
* backlog it is testing for.
|
|
*
|
|
* One `readdir` per directory, dirents only -- no `stat` per entry, and no
|
|
* `opendir` streaming. Measured against a real 36,600-loose-ref repository, the
|
|
* batched form is ~8x faster (23ms vs 177ms median to reach a 1000 threshold)
|
|
* and holds the event loop for less than half as long, because streaming issues
|
|
* a thread-pool round trip every 32 entries where this issues one per
|
|
* directory. The cost is holding one directory's dirents at a time, which is
|
|
* bounded by the widest ref namespace rather than by the size of the tree.
|
|
*
|
|
* Strictly sequential on purpose: it awaits one directory before opening the
|
|
* next, so it can never occupy more than one of libuv's four thread-pool slots
|
|
* and cannot stall unrelated main-process filesystem work.
|
|
*
|
|
* `signal` stops the walk between directories. A single hung `readdir` is not
|
|
* interruptible, but it holds no Git lock, so it delays only maintenance.
|
|
*/
|
|
export async function countLooseRefs(
|
|
refsDirectory: string,
|
|
budget: number,
|
|
signal?: AbortSignal
|
|
): Promise<LooseRefCount> {
|
|
const pending = [refsDirectory]
|
|
let count = 0
|
|
let visited = 0
|
|
while (pending.length > 0) {
|
|
const directory = pending.pop()
|
|
if (directory === undefined) {
|
|
break
|
|
}
|
|
visited += 1
|
|
// A cancelled walk reports what it saw as a floor rather than throwing; callers
|
|
// already have to treat a saturated result as "not known to be clean".
|
|
if (
|
|
signal?.aborted === true ||
|
|
visited > DIRECTORY_VISIT_CEILING ||
|
|
pending.length > DIRECTORY_VISIT_CEILING
|
|
) {
|
|
return { count, saturated: true }
|
|
}
|
|
let entries: { name: string; isDirectory: () => boolean }[]
|
|
try {
|
|
entries = await readdir(directory, { withFileTypes: true })
|
|
} catch {
|
|
// A missing or unreadable namespace contributes nothing to the count.
|
|
continue
|
|
}
|
|
for (const entry of entries) {
|
|
if (entry.isDirectory()) {
|
|
pending.push(join(directory, entry.name))
|
|
continue
|
|
}
|
|
count += 1
|
|
if (count >= budget) {
|
|
return { count, saturated: true }
|
|
}
|
|
}
|
|
}
|
|
return { count, saturated: false }
|
|
}
|