Skip to content

Commit 74ce349

Browse files
committed
fix(client-runtime): serialize thread cache saves and deletion
1 parent 8d74e12 commit 74ce349

2 files changed

Lines changed: 61 additions & 15 deletions

File tree

‎packages/client-runtime/src/state/threads-sync.test.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,6 +1157,46 @@ describe("EnvironmentThreads", () => {
11571157
}),
11581158
);
11591159

1160+
for (const deletion of ["event", "not-found"] as const) {
1161+
it.effect(`waits for an in-flight cache save before ${deletion} removal`, () =>
1162+
Effect.gen(function* () {
1163+
const writing = yield* Deferred.make<void>();
1164+
const release = yield* Deferred.make<void>();
1165+
const written = yield* Deferred.make<void>();
1166+
const removed = yield* Deferred.make<void>();
1167+
const cached = yield* Ref.make(false);
1168+
const harness = yield* makeHarness({
1169+
saveThread: () =>
1170+
Effect.gen(function* () {
1171+
yield* Deferred.succeed(writing, undefined);
1172+
yield* Deferred.await(release);
1173+
yield* Ref.set(cached, true);
1174+
yield* Deferred.succeed(written, undefined);
1175+
}),
1176+
onRemoveThread: Ref.set(cached, false).pipe(
1177+
Effect.andThen(Deferred.succeed(removed, undefined)),
1178+
Effect.asVoid,
1179+
),
1180+
});
1181+
yield* Queue.offer(harness.inputs, snapshot(BASE_THREAD));
1182+
yield* awaitThreadState(harness.observed, (value) => value.status === "live");
1183+
yield* TestClock.adjust("500 millis");
1184+
yield* Deferred.await(writing);
1185+
yield* Queue.offer(
1186+
harness.inputs,
1187+
deletion === "event"
1188+
? deleted()
1189+
: new OrchestrationThreadNotFoundError({ threadId: THREAD_ID }),
1190+
);
1191+
yield* awaitThreadState(harness.observed, (value) => value.status === "deleted");
1192+
yield* Deferred.succeed(release, undefined);
1193+
yield* Deferred.await(written);
1194+
yield* Deferred.await(removed);
1195+
expect(yield* Ref.get(cached)).toBe(false);
1196+
}),
1197+
);
1198+
}
1199+
11601200
it.effect("does not resurrect a missing thread via queued persistence", () =>
11611201
Effect.gen(function* () {
11621202
const harness = yield* makeHarness({ cached: BASE_THREAD });

‎packages/client-runtime/src/state/threads.ts‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ export const makeEnvironmentThreadState = Effect.fn("EnvironmentThreadState.make
259259
readonly epoch: number;
260260
} | null>(null);
261261
const persistence = yield* Queue.sliding<OrchestrationThreadDetailSnapshot>(1);
262+
// Cache removal must finish after any save that already passed its state
263+
// check. Keep storage I/O separate from the stream/history application lock.
264+
const persistenceLock = yield* Semaphore.make(1);
262265
// Latch set when the server reports the thread missing (subscribe fails
263266
// with OrchestrationThreadNotFoundError). Gates the outer foreground/probe
264267
// resubscribe path below so a deleted thread stops after its single
@@ -268,9 +271,8 @@ export const makeEnvironmentThreadState = Effect.fn("EnvironmentThreadState.make
268271
const persist = Effect.fn("EnvironmentThreadState.persist")(function* (
269272
snapshot: OrchestrationThreadDetailSnapshot,
270273
) {
271-
// A debounced write racing a deletion must not resurrect the cache after
272-
// setDeleted removes it; the queue drain in setDeleted drops pending
273-
// offers, this guard drops the offer already past the debounce.
274+
// Under persistenceLock, delayed writes skip deleted snapshots and
275+
// deletion waits for saves that have already passed this check.
274276
if ((yield* SubscriptionRef.get(state)).status === "deleted") return;
275277
if (resumeCache !== undefined && resumeCache.owner !== owner) return;
276278
if (
@@ -304,7 +306,7 @@ export const makeEnvironmentThreadState = Effect.fn("EnvironmentThreadState.make
304306
),
305307
),
306308
);
307-
});
309+
}, persistenceLock.withPermits(1));
308310

309311
yield* Stream.fromQueue(persistence).pipe(
310312
Stream.debounce("500 millis"),
@@ -408,17 +410,21 @@ export const makeEnvironmentThreadState = Effect.fn("EnvironmentThreadState.make
408410
// snapshot cannot re-save the thread after deletion. The queue is
409411
// sliding(1), so a single poll discards the whole backlog.
410412
yield* Queue.poll(persistence);
411-
if (resumeCache !== undefined && resumeCache.owner !== owner) return;
412-
yield* cache.removeThread(environmentId, threadId).pipe(
413-
Effect.catch((error) =>
414-
Effect.logWarning("Could not remove the cached thread.").pipe(
415-
Effect.annotateLogs({
416-
environmentId,
417-
threadId,
418-
error: error.message,
419-
}),
420-
),
421-
),
413+
yield* persistenceLock.withPermits(1)(
414+
Effect.gen(function* () {
415+
if (resumeCache !== undefined && resumeCache.owner !== owner) return;
416+
yield* cache.removeThread(environmentId, threadId).pipe(
417+
Effect.catch((error) =>
418+
Effect.logWarning("Could not remove the cached thread.").pipe(
419+
Effect.annotateLogs({
420+
environmentId,
421+
threadId,
422+
error: error.message,
423+
}),
424+
),
425+
),
426+
);
427+
}),
422428
);
423429
});
424430

0 commit comments

Comments
 (0)