Skip to content

Commit 90e726a

Browse files
committed
fix(server): retain skipped recovery failure causes
1 parent 0411d5d commit 90e726a

2 files changed

Lines changed: 33 additions & 5 deletions

File tree

‎apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.test.ts‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import * as Effect from "effect/Effect";
1818
import * as Cause from "effect/Cause";
1919
import * as Exit from "effect/Exit";
2020
import * as Layer from "effect/Layer";
21+
import * as Logger from "effect/Logger";
2122
import * as Option from "effect/Option";
2223
import * as Ref from "effect/Ref";
2324

@@ -45,6 +46,10 @@ it.effect.each([
4546
const badThread = ThreadId.make("recovery-bad-thread");
4647
const healthyThread = ThreadId.make("recovery-healthy-thread");
4748
const committed = yield* Ref.make<ThreadId[]>([]);
49+
const logs: Array<{ message: unknown; cause: Cause.Cause<unknown> }> = [];
50+
const logger = Logger.make(({ message, cause }) => {
51+
logs.push({ message, cause });
52+
});
4853
const layer = ProviderRuntimeRecovery.layer.pipe(
4954
Layer.provide(ServerSettings.layerTest()),
5055
Layer.provide(
@@ -98,12 +103,34 @@ it.effect.each([
98103
);
99104
const summary = yield* ProviderRuntimeRecovery.ProviderRuntimeRecoveryService.pipe(
100105
Effect.flatMap((recovery) => recovery.reconcile(trigger)),
101-
Effect.provide(layer),
106+
Effect.provide(Layer.merge(layer, Logger.layer([logger], { mergeWithExisting: false }))),
102107
);
103108
assert.deepEqual(yield* Ref.get(committed), [healthyThread]);
104109
assert.equal(summary.closedRequests, 1);
105110
assert.equal(summary.requeuedEffects, 2);
106111
assert.equal(summary.retiredEffects, 3);
112+
assert.equal(logs.length, 1);
113+
const log = logs[0]!;
114+
assert.deepEqual(log.message, [
115+
"orchestration-v2.runtime-recovery.thread-failed",
116+
{ trigger, threadId: badThread },
117+
]);
118+
if (kind === "defect") {
119+
assert.equal(
120+
Cause.squash(log.cause),
121+
failure === "read" ? "corrupt thread projection" : "corrupt thread event",
122+
);
123+
} else {
124+
const error = Option.getOrThrow(Cause.findErrorOption(log.cause));
125+
assert.instanceOf(error, ProviderRuntimeRecovery.ProviderRuntimeRecoveryError);
126+
assert.equal(error.operation, failure === "read" ? "read-projections" : "reconcile");
127+
assert.equal(error.threadId, badThread);
128+
if (failure === "read") {
129+
assert.instanceOf(error.cause, ProjectionStore.ProjectionStoreReadError);
130+
} else {
131+
assert.instanceOf(error.cause, EventSink.EventSinkWriteError);
132+
}
133+
}
107134
}),
108135
);
109136

‎apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -748,10 +748,11 @@ export const make = Effect.gen(function* () {
748748
Effect.catchCause((cause) =>
749749
Cause.hasInterruptsOnly(cause)
750750
? Effect.failCause(cause)
751-
: Effect.logError("orchestration-v2.runtime-recovery.thread-failed", {
752-
trigger,
753-
threadId,
754-
}).pipe(Effect.as(null)),
751+
: Effect.logError(
752+
"orchestration-v2.runtime-recovery.thread-failed",
753+
{ trigger, threadId },
754+
cause,
755+
).pipe(Effect.as(null)),
755756
),
756757
);
757758
if (result === null) continue;

0 commit comments

Comments
 (0)