fix(database,webapp): address review — exclude acquisition errors from serialization retry, clamp maxWait, narrow release note

Author: ericallam

.server-changes/transaction-resilience-during-db-interruptions.md

@@ -3,4 +3,4 @@ area: webapp
 type: improvement
 ---
 
-Triggering tasks is now more resilient to brief database interruptions, so short stalls are far less likely to surface as errors.
+Triggering tasks is now more resilient to brief, transient service interruptions, so short stalls are less likely to surface as errors.

apps/webapp/app/db.server.ts

@@ -88,7 +88,7 @@ function resolveTransactionResilience(
     overrides.budgetPerSec ?? env.DATABASE_TRANSACTION_START_RETRY_BUDGET_PER_SEC;
   const budgetBurst = overrides.budgetBurst ?? env.DATABASE_TRANSACTION_START_RETRY_BUDGET_BURST;
   return {
-    maxWait: overrides.maxWaitMs ?? env.DATABASE_TRANSACTION_MAX_WAIT_MS,
+    maxWait: Math.max(0, overrides.maxWaitMs ?? env.DATABASE_TRANSACTION_MAX_WAIT_MS),
     startRetry: {
       options: {
         enabled: overrides.enabled ?? env.DATABASE_TRANSACTION_START_RETRY_ENABLED,

internal-packages/database/src/transaction.test.ts

@@ -186,4 +186,31 @@ describe("$transaction startRetry wiring", () => {
   it("UNLIMITED_RETRY_BUDGET always consumes", () => {
     expect(UNLIMITED_RETRY_BUDGET.tryConsume()).toBe(true);
   });
+
+  it("does not let maxRetries retry an acquisition error beyond the startRetry budget", async () => {
+    const prisma = { $transaction: vi.fn().mockRejectedValue(acquisitionError()) } as any;
+    await expect(
+      $transaction(
+        prisma,
+        async () => "x",
+        () => {},
+        { startRetry: config({ maxAttempts: 2 }), maxRetries: 3 }
+      )
+    ).rejects.toMatchObject({ code: "P2028" });
+    expect(prisma.$transaction).toHaveBeenCalledTimes(2);
+  });
+
+  it("still lets maxRetries retry a serialization error (P2034)", async () => {
+    const serializationError = { code: "P2034", message: "write conflict / deadlock" };
+    const prisma = { $transaction: vi.fn().mockRejectedValue(serializationError) } as any;
+    await expect(
+      $transaction(
+        prisma,
+        async () => "x",
+        () => {},
+        { maxRetries: 2 }
+      )
+    ).rejects.toMatchObject({ code: "P2034" });
+    expect(prisma.$transaction).toHaveBeenCalledTimes(3);
+  });
 });

internal-packages/database/src/transaction.ts

@@ -239,6 +239,7 @@ export async function $transaction<R>(
   } catch (error) {
     if (
       isPrismaRetriableError(error) &&
+      !isTransactionAcquisitionError(error) &&
       typeof options?.maxRetries === "number" &&
       attempt < options.maxRetries
     ) {