From c417a7f9ab6756a31e847c30960dbb36ad09e6f6 Mon Sep 17 00:00:00 2001 From: Akhil Date: Sun, 16 Jul 2023 07:19:37 +0000 Subject: [PATCH 1/2] feat: added isRetry in jobRunExecution --- apps/webapp/app/services/runs/continueRun.server.ts | 1 + apps/webapp/app/services/runs/performRunExecution.server.ts | 3 ++- .../migration.sql | 2 ++ packages/database/prisma/schema.prisma | 2 ++ packages/internal/src/schemas/api.ts | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 packages/database/prisma/migrations/20230716054029_is_retry_for_job_run_execution/migration.sql diff --git a/apps/webapp/app/services/runs/continueRun.server.ts b/apps/webapp/app/services/runs/continueRun.server.ts index b85e2082a..f6ee46623 100644 --- a/apps/webapp/app/services/runs/continueRun.server.ts +++ b/apps/webapp/app/services/runs/continueRun.server.ts @@ -70,6 +70,7 @@ export class ContinueRunService { status: "PENDING", reason: "EXECUTE_JOB", retryLimit: EXECUTE_JOB_RETRY_LIMIT, + isRetry: true, }, }); diff --git a/apps/webapp/app/services/runs/performRunExecution.server.ts b/apps/webapp/app/services/runs/performRunExecution.server.ts index e9e34ab9e..6e6cebe57 100644 --- a/apps/webapp/app/services/runs/performRunExecution.server.ts +++ b/apps/webapp/app/services/runs/performRunExecution.server.ts @@ -193,7 +193,7 @@ export class PerformRunExecutionService { } } async #executeJob(execution: FoundRunExecution) { - const { run } = execution; + const { run, isRetry } = execution; if (run.status === "CANCELED") { await this.#cancelExecution(execution); @@ -264,6 +264,7 @@ export class PerformRunExecutionService { id: run.id, isTest: run.isTest, startedAt, + isRetry, }, environment: { id: run.environment.id, diff --git a/packages/database/prisma/migrations/20230716054029_is_retry_for_job_run_execution/migration.sql b/packages/database/prisma/migrations/20230716054029_is_retry_for_job_run_execution/migration.sql new file mode 100644 index 000000000..6c28d32e4 --- /dev/null +++ b/packages/database/prisma/migrations/20230716054029_is_retry_for_job_run_execution/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "JobRunExecution" ADD COLUMN "isRetry" BOOLEAN NOT NULL DEFAULT false; diff --git a/packages/database/prisma/schema.prisma b/packages/database/prisma/schema.prisma index c998d62c4..5d62807e3 100644 --- a/packages/database/prisma/schema.prisma +++ b/packages/database/prisma/schema.prisma @@ -737,6 +737,8 @@ model JobRunExecution { resumeTaskId String? graphileJobId String? + + isRetry Boolean @default(false) } enum JobRunExecutionReason { diff --git a/packages/internal/src/schemas/api.ts b/packages/internal/src/schemas/api.ts index c1025c5d7..ea412626d 100644 --- a/packages/internal/src/schemas/api.ts +++ b/packages/internal/src/schemas/api.ts @@ -307,6 +307,7 @@ export const RunJobBodySchema = z.object({ run: z.object({ id: z.string(), isTest: z.boolean(), + isRetry: z.boolean(), startedAt: z.coerce.date(), }), environment: z.object({ From 0066971b7703146ba17a247706b589972c5bb1f4 Mon Sep 17 00:00:00 2001 From: Akhil Date: Sun, 16 Jul 2023 10:36:27 +0000 Subject: [PATCH 2/2] chore: added changeset --- .changeset/pretty-zoos-approve.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/pretty-zoos-approve.md diff --git a/.changeset/pretty-zoos-approve.md b/.changeset/pretty-zoos-approve.md new file mode 100644 index 000000000..29144acb4 --- /dev/null +++ b/.changeset/pretty-zoos-approve.md @@ -0,0 +1,5 @@ +--- +"@trigger.dev/sdk": patch +--- + +added isRetry in context run