Skip to content

Commit b96f4f9

Browse files
committed
fix(lease): 'released' on a canceled allocation means the billed session is confirmed gone
Re-review at 3665ea0: unifying the release path had made the cancellation error report released:true from the daemon's registry record while the provider DELETE had failed — success-shaped again, with the operator verdict demoted to a second key. Fixed at the source of the ambiguity: - LeaseReleaseOutcome names its bookkeeping field registryReleased. - On the canceled error, 'released' is true only when registryReleased AND the provider released without warnings AND without throwing; the registry record is exposed as 'registryReleased'. The stop-by-hand hint keys on 'released'. - lease_release keeps its existing wire field ('released' = registry; provider cleanup rides in 'provider'), unchanged. - Regressions: failed DELETE and throwing release both pin released:false / registryReleased:true (+ providerSessionId, warnings|releaseError, hint); both proven red on registry-only semantics.
1 parent 3665ea0 commit b96f4f9

2 files changed

Lines changed: 67 additions & 14 deletions

File tree

‎src/daemon/__tests__/request-handler-catalog.test.ts‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ test('a lease allocated for a requester that left is released, not registered',
331331
assert.ok(isRequestCanceledError(error));
332332
const details = (error as AppError).details ?? {};
333333
assert.equal(details.released, true);
334-
assert.equal(details.providerReleased, true);
334+
assert.equal(details.registryReleased, true);
335335
assert.match(String(details.providerSessionId), /^bs-/);
336336
return true;
337337
},
@@ -377,8 +377,10 @@ test('a failed provider release after cancellation is reported as unreleased wit
377377
(error: unknown) => {
378378
assert.ok(isRequestCanceledError(error));
379379
const details = (error as AppError).details ?? {};
380-
assert.equal(details.released, true, 'the daemon lease record is gone either way');
381-
assert.equal(details.providerReleased, false);
380+
// `released` is the operator's answer: the billed session is NOT confirmed
381+
// gone. Daemon bookkeeping is a separate, unambiguous key.
382+
assert.equal(details.released, false);
383+
assert.equal(details.registryReleased, true);
382384
assert.equal(details.providerSessionId, 'bs-live');
383385
assert.match(String(details.hint), /could NOT be confirmed released/);
384386
assert.match(String(details.hint), /bs-live/);
@@ -393,6 +395,45 @@ test('a failed provider release after cancellation is reported as unreleased wit
393395
}
394396
});
395397

398+
test('a throwing provider release after cancellation is reported as unreleased, not raised', async () => {
399+
const leaseRegistry = new LeaseRegistry();
400+
const sessionStore = makeSessionStore('agent-device-lease-gone-throw-');
401+
const requestId = 'lease-alloc-gone-release-threw';
402+
const registration = registerRequestAbort(requestId);
403+
404+
try {
405+
await assert.rejects(
406+
() =>
407+
handleLeaseCommands({
408+
req: leaseAllocateRequest(requestId),
409+
sessionName: 'catalog-test',
410+
sessionStore,
411+
leaseRegistry,
412+
leaseLifecycleProvider: {
413+
allocate: async () => {
414+
markRequestCanceled(requestId);
415+
return { providerSessionId: 'bs-live' };
416+
},
417+
release: async () => {
418+
throw new Error('hub unreachable');
419+
},
420+
},
421+
}),
422+
(error: unknown) => {
423+
assert.ok(isRequestCanceledError(error), 'nobody is left to receive the release failure');
424+
const details = (error as AppError).details ?? {};
425+
assert.equal(details.released, false);
426+
assert.equal(details.registryReleased, true);
427+
assert.equal(details.releaseError, 'hub unreachable');
428+
assert.match(String(details.hint), /could NOT be confirmed released/);
429+
return true;
430+
},
431+
);
432+
} finally {
433+
clearRequestAbortRegistration(registration);
434+
}
435+
});
436+
396437
function leaseAllocateRequest(requestId: string): DaemonRequest {
397438
return {
398439
command: INTERNAL_COMMANDS.leaseAllocate,

‎src/daemon/handlers/lease.ts‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ export async function handleLeaseCommands(args: LeaseHandlerArgs): Promise<Daemo
111111
return {
112112
ok: true,
113113
data: {
114-
released: outcome.released,
114+
// Wire field: the daemon's registry record; provider cleanup rides in `provider`.
115+
released: outcome.registryReleased,
115116
...(outcome.provider ? { provider: outcome.provider } : {}),
116117
},
117118
};
@@ -134,8 +135,8 @@ function leaseReleaseRequestFor(lease: DeviceLease): ReleaseLeaseRequest {
134135
}
135136

136137
type LeaseReleaseOutcome = {
137-
/** The daemon's own lease record was released. */
138-
released: boolean;
138+
/** The daemon's own lease record was released (bookkeeping, not the billed resource). */
139+
registryReleased: boolean;
139140
/** Provider release data (providerSessionId, warnings, cloudArtifacts…) when a provider held it. */
140141
provider?: Record<string, unknown>;
141142
};
@@ -149,7 +150,7 @@ async function releaseLease(
149150
context?: LeaseLifecycleContext,
150151
): Promise<LeaseReleaseOutcome> {
151152
const provider = lease ? await leaseLifecycleProvider?.release?.(lease, context) : undefined;
152-
return { released: leaseRegistry.releaseLease(request).released, provider };
153+
return { registryReleased: leaseRegistry.releaseLease(request).released, provider };
153154
}
154155

155156
/**
@@ -171,7 +172,7 @@ async function releaseAllocationForGoneRequester(
171172
outcome = await releaseLease(leaseRegistry, leaseLifecycleProvider, lease, request);
172173
} catch (error) {
173174
releaseError = errorMessage(error);
174-
outcome = { released: leaseRegistry.releaseLease(request).released };
175+
outcome = { registryReleased: leaseRegistry.releaseLease(request).released };
175176
}
176177
return canceledAllocationError(lease, outcome, releaseError);
177178
}
@@ -183,21 +184,32 @@ function canceledAllocationError(
183184
): AppError {
184185
const providerSessionId = outcome.provider?.providerSessionId;
185186
const warnings = Array.isArray(outcome.provider?.warnings) ? outcome.provider.warnings : [];
186-
const providerReleased = releaseError === undefined && warnings.length === 0;
187+
// `released` answers the operator's question — is the billed session gone? —
188+
// and is only true when the provider released without warnings or throwing.
189+
const released = outcome.registryReleased && releaseError === undefined && warnings.length === 0;
187190
return createRequestCanceledError({
188191
leaseId: lease.leaseId,
189192
leaseProvider: lease.leaseProvider,
190-
released: outcome.released,
191-
providerReleased,
193+
released,
194+
registryReleased: outcome.registryReleased,
192195
providerSessionId,
193196
...(warnings.length > 0 ? { warnings } : {}),
194197
...(releaseError !== undefined ? { releaseError } : {}),
195-
hint: providerReleased
196-
? 'The lease request was canceled while the provider was still allocating; the session it produced was released.'
197-
: `The lease request was canceled while the provider was still allocating, and the session it produced could NOT be confirmed released — it may still be running and billing. Stop provider session ${String(providerSessionId ?? '(unknown)')} for lease ${lease.leaseId} by hand.`,
198+
hint: canceledAllocationHint(released, lease.leaseId, providerSessionId),
198199
});
199200
}
200201

202+
function canceledAllocationHint(
203+
released: boolean,
204+
leaseId: string,
205+
providerSessionId: unknown,
206+
): string {
207+
if (released) {
208+
return 'The lease request was canceled while the provider was still allocating; the session it produced was released.';
209+
}
210+
return `The lease request was canceled while the provider was still allocating, and the session it produced could NOT be confirmed released — it may still be running and billing. Stop provider session ${String(providerSessionId ?? '(unknown)')} for lease ${leaseId} by hand.`;
211+
}
212+
201213
function leaseLifecycleContext(req: DaemonRequest): LeaseLifecycleContext {
202214
return {
203215
flags: req.flags,

0 commit comments

Comments
 (0)