diff --git a/apps/webapp/app/v3/services/batchTriggerV3.server.ts b/apps/webapp/app/v3/services/batchTriggerV3.server.ts index c059597941..72e56908a0 100644 --- a/apps/webapp/app/v3/services/batchTriggerV3.server.ts +++ b/apps/webapp/app/v3/services/batchTriggerV3.server.ts @@ -904,7 +904,8 @@ export async function completeBatchTaskRunItemV3( itemId: string, batchTaskRunId: string, tx: PrismaClientOrTransaction, - scheduleResumeOnComplete = false + scheduleResumeOnComplete = false, + taskRunAttemptId?: string ) { await $transaction(tx, "completeBatchTaskRunItemV3", async (tx, span) => { span?.setAttribute("batch_id", batchTaskRunId); @@ -917,6 +918,7 @@ export async function completeBatchTaskRunItemV3( }, data: { status: "COMPLETED", + taskRunAttemptId, }, }); diff --git a/apps/webapp/app/v3/services/resumeBatchRun.server.ts b/apps/webapp/app/v3/services/resumeBatchRun.server.ts index 81fac088a6..6a794e238c 100644 --- a/apps/webapp/app/v3/services/resumeBatchRun.server.ts +++ b/apps/webapp/app/v3/services/resumeBatchRun.server.ts @@ -9,9 +9,6 @@ const finishedBatchRunStatuses = ["COMPLETED", "FAILED", "CANCELED"]; type RetrieveBatchRunResult = NonNullable>>; -// {"batchRunId":"cm6l2qfs400d0dyiczcwiuwrp","dependentTaskAttempt":{"status":"PAUSED","id":"cm6l2qcqf00cydyicryir6xlu","taskRun":{"id":"cm6l2qaw200cudyicktkfh4k9","queue":"task/batch-trigger-sequentially","taskIdentifier":"batch-trigger-sequentially","concurrencyKey":null}},"checkpointEventId":"cm6l2qg7400dgdyicy6qx9s8u","timestamp":"2025-01-31T18:04:52.869Z","name":"webapp","message":"ResumeBatchRunService: Attempt is paused and has a checkpoint event","level":"debug","skipForwarding":true} -// {"batchRunId":"cm6l2qfs400d0dyiczcwiuwrp","dependentTaskAttempt":{"status":"PAUSED","id":"cm6l2qcqf00cydyicryir6xlu","taskRun":{"id":"cm6l2qaw200cudyicktkfh4k9","queue":"task/batch-trigger-sequentially","taskIdentifier":"batch-trigger-sequentially","concurrencyKey":null}},"checkpointEventId":"cm6l2qg7400dgdyicy6qx9s8u","hasCheckpointEvent":true,"timestamp":"2025-01-31T18:04:52.871Z","name":"webapp","message":"ResumeBatchRunService: with checkpoint was already completed","level":"debug","skipForwarding":true} - export class ResumeBatchRunService extends BaseService { public async call(batchRunId: string) { const batchRun = await this._prisma.batchTaskRun.findFirst({ diff --git a/apps/webapp/app/v3/services/resumeDependentParents.server.ts b/apps/webapp/app/v3/services/resumeDependentParents.server.ts index d019f1db1a..1bacfc22ee 100644 --- a/apps/webapp/app/v3/services/resumeDependentParents.server.ts +++ b/apps/webapp/app/v3/services/resumeDependentParents.server.ts @@ -257,7 +257,8 @@ export class ResumeDependentParentsService extends BaseService { batchTaskRunItem.id, batchTaskRunItem.batchTaskRunId, this._prisma, - true + true, + lastAttempt.id ); } else { logger.debug( diff --git a/apps/webapp/app/v3/services/resumeTaskRunDependencies.server.ts b/apps/webapp/app/v3/services/resumeTaskRunDependencies.server.ts index 59f7964e48..9615af5abf 100644 --- a/apps/webapp/app/v3/services/resumeTaskRunDependencies.server.ts +++ b/apps/webapp/app/v3/services/resumeTaskRunDependencies.server.ts @@ -69,7 +69,13 @@ export class ResumeTaskRunDependenciesService extends BaseService { taskAttempt: TaskRunAttempt ) { if (batchTaskRun.batchVersion === "v3") { - await completeBatchTaskRunItemV3(batchItem.id, batchTaskRun.id, this._prisma, true); + await completeBatchTaskRunItemV3( + batchItem.id, + batchTaskRun.id, + this._prisma, + true, + taskAttempt.id + ); } else { await $transaction(this._prisma, async (tx) => { await tx.batchTaskRunItem.update({