Skip to content

Autonomous development for real products. Governed agents build from specs you approve, follow the rules you set, and nothing merges until another agent proves it. Your decisions, judgement and taste are the bar that work must clear. Declare your vision and let agents build it.

fix(gate): report current runner availability at deadline [C7]

Corey Olson9a0c36f53349
diff --git a/src/resources.js b/src/resources.js
index 718663e8..f67324b7 100644
--- a/src/resources.js
+++ b/src/resources.js
@@ -959,7 +959,7 @@ export async function takeResource(options) {
let runnerDeadline;
if (runnerDeadlinePassed) {
const state = snapshot(db, name, order, now);
- runnerDeadline = { at: runnerDeadlineAt, runners: runnerWaitReasons(db, runners, { ...waiter, timing: Number(timing) }),
+ runnerDeadline = { at: runnerDeadlineAt, runners: runnerWaitReasons(db, runners, { ...waiter, timing: Number(timing) }, unavailable),
branch: localWaitBranch({ capacity: limit, browserCapacity: options.browserCapacityProvider?.() ?? 1,
runnerOnly: false, browser, timing, memoryHeld: memory?.held === true, holders: state.holders }) };
db.prepare('UPDATE waiter SET runner_wait_branch = ?, runner_wait_reasons = ? WHERE token = ?')
diff --git a/src/runner-wait.js b/src/runner-wait.js
index 96341e42..41fba3fc 100644
--- a/src/runner-wait.js
+++ b/src/runner-wait.js
@@ -16,15 +16,15 @@ export function validateRunnerWaitMs(value) {
}
/** Explain each registered runner from the same local facts used by admission; no network probe. */
-export function runnerWaitReasons(db, runners, waiter) {
+export function runnerWaitReasons(db, runners, waiter, unavailable) {
return runners.map(runner => {
const recorded = db.prepare('SELECT detail FROM runner_unavailable WHERE host = ?').get(runner.host);
const observed = db.prepare('SELECT gui FROM runner_gui WHERE host = ?').get(runner.host);
const gui = observed ? observed.gui === 1 : runner.gui === true;
const holders = db.prepare('SELECT browser, timing FROM holder WHERE name = ?').all(`runner:${runner.host}`);
let reason = 'available';
- if (recorded?.detail === 'TRANSPORT_LOST') reason = 'unreachable (transport lost)';
- else if (recorded || db.prepare('SELECT host FROM runner_draining WHERE host = ?').get(runner.host)) reason = 'unavailable (cleanup or draining)';
+ if (unavailable.has(runner.host) && recorded?.detail === 'TRANSPORT_LOST') reason = 'unreachable (transport lost)';
+ else if (unavailable.has(runner.host)) reason = 'unavailable (cleanup or draining)';
else if (waiter.gui === 1 && !gui) reason = 'unavailable (GUI session required)';
else if (waiter.browser === 1 && runner.browser < 1) reason = 'unavailable (browser capacity required)';
else if (holders.length >= runner.slots || holders.some(holder => holder.timing === 1)
diff --git a/test/runner-wait-deadline.test.js b/test/runner-wait-deadline.test.js
index 8ba8dde8..7c1a8cb4 100644
--- a/test/runner-wait-deadline.test.js
+++ b/test/runner-wait-deadline.test.js
@@ -149,10 +149,12 @@ test('the public runner deadline setting has a five-minute default and rejects u
const box = e2e.project('true');
const initial = cli(box.repo, box.env, 'settings', '--json');
assert.equal(initial.status, 0, fixtureResultContext(initial));
- assert.equal(JSON.parse(initial.stdout).settings.gate.runnerWaitMs, 300_000);
- const changed = cli(box.repo, box.env, 'settings', 'gate.runnerWaitMs', '1500', '--json');
+ const approvedDefault = 300_000; // budget: the approved five-minute default in milliseconds.
+ assert.equal(JSON.parse(initial.stdout).settings.gate.runnerWaitMs, approvedDefault);
+ const configuredDuration = 1500; // budget: a private configurable duration whose exact value must persist.
+ const changed = cli(box.repo, box.env, 'settings', 'gate.runnerWaitMs', String(configuredDuration), '--json');
assert.equal(changed.status, 0, fixtureResultContext(changed));
- assert.equal(JSON.parse(changed.stdout).settings.gate.runnerWaitMs, 1500);
+ assert.equal(JSON.parse(changed.stdout).settings.gate.runnerWaitMs, configuredDuration);
const file = join(box.env.PULLBOARD_MACHINE_HOME, 'settings.json');
const before = readFileSync(file, 'utf8');
for (const value of ['0', '-1', '1.5', '2147483648', 'Infinity']) {
@@ -197,3 +199,41 @@ test('an executing runner command keeps its test budget after the admission dead
}
}
});
+
+test('a busy runner is named at the deadline and fallback waits for a real local slot [C7,Q1,Q2]', async () => {
+ const box = fixture({ dropFirst: false });
+ const previous = [process.env.PULLBOARD_HOME, process.env.PULLBOARD_MACHINE_HOME];
+ process.env.PULLBOARD_HOME = box.env.PULLBOARD_HOME;
+ process.env.PULLBOARD_MACHINE_HOME = box.env.PULLBOARD_MACHINE_HOME;
+ let held;
+ let remote;
+ let pending;
+ try {
+ held = await takeResource({ name: 'gate', scope: 'machine', root: box.repo, capacity: 1, agent: 'busy-local-holder' });
+ const settings = JSON.parse(readFileSync(box.settingsFile, 'utf8'));
+ remote = await takeResource({ name: 'gate', scope: 'machine', root: box.repo, capacity: 1,
+ browser: true, browserCapacityProvider: () => 1, remote: true,
+ runnerProvider: () => settings.runners, agent: 'real-remote-reservation' });
+ assert.equal(remote.runner.host, HOST + '-drop');
+ pending = runThroughGate(box.repo, box.env, 'node -e "console.log(\'BUSY_FALLBACK_LOCAL\')"', { item: 'busy-case', requests: box.requests });
+ const queue = () => listResources({ scope: 'machine' }).find(resource => resource.name === 'gate');
+ await observe(() => queue()?.line.some(row => row.item === 'busy-case' && row.runnerDeadline), 'busy-runner deadline with both real capacities held');
+ const row = queue().line.find(waiter => waiter.item === 'busy-case');
+ assert.match(row.runnerDeadline.branch, /local gate slots busy/u);
+ assert.equal(row.runnerDeadline.runners[0].reason, 'busy');
+ assert.equal(existsSync(box.starts), false, 'a busy reservation is never oversubscribed');
+ held.release(); held = null;
+ const result = await pending; pending = null;
+ assert.equal(result.status, 0, fixtureResultContext(result));
+ assert.match(result.stdout, /BUSY_FALLBACK_LOCAL/u);
+ assert.equal(gateResult(result.stdout).runner, undefined);
+ assert.match(result.stderr, new RegExp(HOST + '-drop: busy', 'u'));
+ assert.equal(existsSync(box.starts), false, 'fallback does not retry the still-held remote reservation');
+ } finally {
+ held?.release(); remote?.release();
+ if (pending) await pending.catch(() => {});
+ for (const [index, key] of ['PULLBOARD_HOME', 'PULLBOARD_MACHINE_HOME'].entries()) {
+ if (previous[index] === undefined) delete process.env[key]; else process.env[key] = previous[index];
+ }
+ }
+});