Skip to content

Commit 1e41afe

Browse files
committed
fix(daemon): preserve expiry for late provider sessions
1 parent df3b681 commit 1e41afe

2 files changed

Lines changed: 50 additions & 2 deletions

File tree

‎src/daemon/handlers/__tests__/lease-artifacts.test.ts‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,53 @@ test('artifacts refuses an expired provider session after retention before lazy
117117
assert.deepEqual(world.providerCalls, []);
118118
});
119119

120+
test('artifacts refuses a provider session returned after allocation expiry retention', async () => {
121+
let now = 1_000;
122+
const world = createWorld({
123+
now: () => now,
124+
defaultLeaseTtlMs: 100,
125+
minLeaseTtlMs: 1,
126+
maxLeaseTtlMs: 100,
127+
providerSessionRetentionMs: 50,
128+
});
129+
world.lifecycle.allocate = async (lease) => {
130+
now = lease.expiresAt + 51;
131+
return { providerSessionId: 'late-allocation-session' };
132+
};
133+
134+
await allocateLease(world, 'tenant-a', 'run-a');
135+
await assertProviderSessionNotOwned(world, {
136+
tenantId: 'tenant-a',
137+
runId: 'run-a',
138+
providerSessionId: 'late-allocation-session',
139+
});
140+
assert.deepEqual(world.providerCalls, []);
141+
});
142+
143+
test('artifacts refuses a provider session returned after release expiry retention', async () => {
144+
let now = 1_000;
145+
const world = createWorld({
146+
now: () => now,
147+
defaultLeaseTtlMs: 100,
148+
minLeaseTtlMs: 1,
149+
maxLeaseTtlMs: 100,
150+
providerSessionRetentionMs: 50,
151+
});
152+
const lease = await allocateLease(world, 'tenant-a', 'run-a');
153+
world.lifecycle.release = async (releasedLease) => {
154+
now = releasedLease.expiresAt + 51;
155+
return { providerSessionId: 'late-release-session' };
156+
};
157+
158+
await releaseLease(world, lease);
159+
await assertProviderSessionNotOwned(world, {
160+
tenantId: 'tenant-a',
161+
runId: 'run-a',
162+
providerSessionId: 'late-release-session',
163+
});
164+
assert.deepEqual(world.providerCalls, []);
165+
});
166+
120167
type World = {
121168
leaseRegistry: LeaseRegistry;
122169
sessionStore: ReturnType<typeof makeSessionStore>;

‎src/daemon/lease-registry.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,13 +351,14 @@ export class LeaseRegistry {
351351
}
352352

353353
recordProviderSession(
354-
lease: Pick<DeviceLease, 'leaseId' | 'tenantId' | 'leaseProvider'>,
354+
lease: Pick<DeviceLease, 'leaseId' | 'tenantId' | 'leaseProvider' | 'expiresAt'>,
355355
providerSessionId: string,
356356
): void {
357+
const releasedAt = lease.expiresAt <= this.now() ? lease.expiresAt : undefined;
357358
this.cleanupExpiredLeases();
358359
this.providerSessionOwnership.record(lease, providerSessionId);
359360
if (!this.leases.has(lease.leaseId)) {
360-
this.providerSessionOwnership.markLeaseReleased(lease);
361+
this.providerSessionOwnership.markLeaseReleased(lease, releasedAt);
361362
}
362363
}
363364

0 commit comments

Comments
 (0)