Skip to content

Commit 378a6d5

Browse files
ericallamdeepshekhardas
authored andcommitted
fix(v3): remove executing tasks waiting to deploy
1 parent 2dd9f37 commit 378a6d5

5 files changed

Lines changed: 1 addition & 145 deletions

File tree

apps/webapp/app/services/worker.server.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import {
4141
} from "~/v3/services/cancelDevSessionRuns.server";
4242
import { CancelTaskAttemptDependenciesService } from "~/v3/services/cancelTaskAttemptDependencies.server";
4343
import { EnqueueDelayedRunService } from "~/v3/services/enqueueDelayedRun.server";
44-
import { ExecuteTasksWaitingForDeployService } from "~/v3/services/executeTasksWaitingForDeploy";
4544
import { ExpireEnqueuedRunService } from "~/v3/services/expireEnqueuedRun.server";
4645
import { ResumeBatchRunService } from "~/v3/services/resumeBatchRun.server";
4746
import { ResumeTaskDependencyService } from "~/v3/services/resumeTaskDependency.server";
@@ -220,9 +219,6 @@ function getWorkerQueue() {
220219
priority: 0,
221220
maxAttempts: 5,
222221
handler: async (payload, job) => {
223-
const service = new ExecuteTasksWaitingForDeployService();
224-
225-
return await service.call(payload.backgroundWorkerId);
226222
},
227223
},
228224
// @deprecated, moved to ScheduleEngine
@@ -288,7 +284,7 @@ function getWorkerQueue() {
288284
"v3.requeueTaskRun": {
289285
priority: 0,
290286
maxAttempts: 3,
291-
handler: async (payload, job) => {}, // This is now handled by redisWorker
287+
handler: async (payload, job) => { }, // This is now handled by redisWorker
292288
},
293289
// @deprecated, moved to commonWorker.server.ts
294290
"v3.retryAttempt": {

apps/webapp/app/v3/commonWorker.server.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { BatchTriggerV3Service } from "./services/batchTriggerV3.server";
1414
import { CancelDevSessionRunsService } from "./services/cancelDevSessionRuns.server";
1515
import { CancelTaskAttemptDependenciesService } from "./services/cancelTaskAttemptDependencies.server";
1616
import { EnqueueDelayedRunService } from "./services/enqueueDelayedRun.server";
17-
import { ExecuteTasksWaitingForDeployService } from "./services/executeTasksWaitingForDeploy";
1817
import { ExpireEnqueuedRunService } from "./services/expireEnqueuedRun.server";
1918
import { ResumeBatchRunService } from "./services/resumeBatchRun.server";
2019
import { ResumeTaskDependencyService } from "./services/resumeTaskDependency.server";
@@ -226,8 +225,6 @@ function initializeWorker() {
226225
await service.call(payload.deploymentId, payload.fromStatus, payload.errorMessage);
227226
},
228227
"v3.executeTasksWaitingForDeploy": async ({ payload }) => {
229-
const service = new ExecuteTasksWaitingForDeployService();
230-
await service.call(payload.backgroundWorkerId);
231228
},
232229
"v3.retryAttempt": async ({ payload }) => {
233230
const service = new RetryAttemptService();

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
import { taskMetadataCacheInstance } from "~/services/taskMetadataCacheInstance.server";
1111
import { BaseService, ServiceValidationError } from "./baseService.server";
1212
import { syncDeclarativeSchedules } from "./createBackgroundWorker.server";
13-
import { ExecuteTasksWaitingForDeployService } from "./executeTasksWaitingForDeploy";
1413
import { compareDeploymentVersions } from "../utils/deploymentVersions";
1514

1615
export type ChangeCurrentDeploymentDirection = "promote" | "rollback";
@@ -175,17 +174,6 @@ export class ChangeCurrentDeploymentService extends BaseService {
175174
});
176175
}
177176

178-
// Only V1 engine workers need the WAITING_FOR_DEPLOY drain — V2 runs sit
179-
// in PENDING_VERSION and are handled out of band, so enqueuing here for V2
180-
// just produces empty scans of the TaskRun status index.
181-
const worker = await this._prisma.backgroundWorker.findFirst({
182-
where: { id: deployment.workerId },
183-
select: { engine: true },
184-
});
185-
186-
if (worker?.engine === "V1") {
187-
await ExecuteTasksWaitingForDeployService.enqueue(deployment.workerId);
188-
}
189177
}
190178

191179
async #syncSchedulesForDeployment(deployment: WorkerDeployment) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
stripBackgroundWorkerMetadataForStorage,
1515
syncDeclarativeSchedules,
1616
} from "./createBackgroundWorker.server";
17-
import { ExecuteTasksWaitingForDeployService } from "./executeTasksWaitingForDeploy";
1817
import { projectPubSub } from "./projectPubSub.server";
1918
import { TimeoutDeploymentService } from "./timeoutDeployment.server";
2019
import { CURRENT_DEPLOYMENT_LABEL, BackgroundWorkerId } from "@trigger.dev/core/v3/isomorphic";
@@ -208,7 +207,6 @@ export class CreateDeploymentBackgroundWorkerServiceV3 extends BaseService {
208207
});
209208
}
210209

211-
await ExecuteTasksWaitingForDeployService.enqueue(backgroundWorker.id);
212210
await PerformDeploymentAlertsService.enqueue(deployment.id);
213211
await TimeoutDeploymentService.dequeue(deployment.id, this._prisma);
214212

apps/webapp/app/v3/services/executeTasksWaitingForDeploy.ts

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)