Handle more retriable errors. Add special condition in for race condition error

Author: matt-aitken

apps/webapp/app/v3/services/batchTriggerV3.server.ts

@@ -7,6 +7,7 @@ import {
 } from "@trigger.dev/core/v3";
 import {
   BatchTaskRun,
+  isPrismaRaceConditionError,
   isPrismaRetriableError,
   isUniqueConstraintError,
   Prisma,
@@ -1003,11 +1004,12 @@ export async function completeBatchTaskRunItemV3(
         }
       },
       {
-        timeout: 10000,
+        timeout: 10_000,
+        maxWait: 4_000,
       }
     );
   } catch (error) {
-    if (isPrismaRetriableError(error)) {
+    if (isPrismaRetriableError(error) || isPrismaRaceConditionError(error)) {
       logger.error("completeBatchTaskRunItemV3 failed with a Prisma Error, scheduling a retry", {
         itemId,
         batchTaskRunId,

internal-packages/database/src/transaction.ts

@@ -19,6 +19,13 @@ export function isPrismaKnownError(error: unknown): error is Prisma.PrismaClient
   );
 }
 
+/*
+•	P2024: Connection timeout errors
+•	P2028: Transaction timeout errors
+•	P2034: Transaction deadlock/conflict errors
+*/
+const retryCodes = ["P2024", "P2028", "P2034"];
+
 export function isPrismaRetriableError(error: unknown): boolean {
   if (!isPrismaKnownError(error)) {
     return false;
@@ -27,6 +34,17 @@ export function isPrismaRetriableError(error: unknown): boolean {
   return retryCodes.includes(error.code);
 }
 
+/*
+•	P2025: Record not found errors (in race conditions) [not included for now]
+*/
+export function isPrismaRaceConditionError(error: unknown): boolean {
+  if (!isPrismaKnownError(error)) {
+    return false;
+  }
+
+  return error.code === "P2025";
+}
+
 export type PrismaTransactionOptions = {
   /** The maximum amount of time (in ms) Prisma Client will wait to acquire a transaction from the database. The default value is 2000ms. */
   maxWait?: number;
@@ -47,9 +65,6 @@ export type PrismaTransactionOptions = {
   maxRetries?: number;
 };
 
-//retry these Prisma error codes
-const retryCodes = ["P2034", "P2028"];
-
 export async function $transaction<R>(
   prisma: PrismaClientOrTransaction,
   fn: (prisma: PrismaTransactionClient) => Promise<R>,