Skip to content

Commit 6f52b00

Browse files
authored
Set taskRunAttemptId on batch task run items on completion (#1658)
1 parent d285f79 commit 6f52b00

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,8 @@ export async function completeBatchTaskRunItemV3(
904904
itemId: string,
905905
batchTaskRunId: string,
906906
tx: PrismaClientOrTransaction,
907-
scheduleResumeOnComplete = false
907+
scheduleResumeOnComplete = false,
908+
taskRunAttemptId?: string
908909
) {
909910
await $transaction(tx, "completeBatchTaskRunItemV3", async (tx, span) => {
910911
span?.setAttribute("batch_id", batchTaskRunId);
@@ -917,6 +918,7 @@ export async function completeBatchTaskRunItemV3(
917918
},
918919
data: {
919920
status: "COMPLETED",
921+
taskRunAttemptId,
920922
},
921923
});
922924

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ const finishedBatchRunStatuses = ["COMPLETED", "FAILED", "CANCELED"];
99

1010
type RetrieveBatchRunResult = NonNullable<Awaited<ReturnType<typeof retrieveBatchRun>>>;
1111

12-
// {"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}
13-
// {"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}
14-
1512
export class ResumeBatchRunService extends BaseService {
1613
public async call(batchRunId: string) {
1714
const batchRun = await this._prisma.batchTaskRun.findFirst({

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,8 @@ export class ResumeDependentParentsService extends BaseService {
257257
batchTaskRunItem.id,
258258
batchTaskRunItem.batchTaskRunId,
259259
this._prisma,
260-
true
260+
true,
261+
lastAttempt.id
261262
);
262263
} else {
263264
logger.debug(

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,13 @@ export class ResumeTaskRunDependenciesService extends BaseService {
6969
taskAttempt: TaskRunAttempt
7070
) {
7171
if (batchTaskRun.batchVersion === "v3") {
72-
await completeBatchTaskRunItemV3(batchItem.id, batchTaskRun.id, this._prisma, true);
72+
await completeBatchTaskRunItemV3(
73+
batchItem.id,
74+
batchTaskRun.id,
75+
this._prisma,
76+
true,
77+
taskAttempt.id
78+
);
7379
} else {
7480
await $transaction(this._prisma, async (tx) => {
7581
await tx.batchTaskRunItem.update({

0 commit comments

Comments
 (0)