Skip to content

Commit e853857

Browse files
committed
fix(v3): remove executing tasks waiting to deploy
1 parent bf736a7 commit e853857

File tree

5 files changed

+1
-130
lines changed

5 files changed

+1
-130
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
} from "~/v3/services/cancelDevSessionRuns.server";
2121
import { CancelTaskAttemptDependenciesService } from "~/v3/services/cancelTaskAttemptDependencies.server";
2222
import { EnqueueDelayedRunService } from "~/v3/services/enqueueDelayedRun.server";
23-
import { ExecuteTasksWaitingForDeployService } from "~/v3/services/executeTasksWaitingForDeploy";
2423
import { ExpireEnqueuedRunService } from "~/v3/services/expireEnqueuedRun.server";
2524
import { ResumeBatchRunService } from "~/v3/services/resumeBatchRun.server";
2625
import { ResumeTaskDependencyService } from "~/v3/services/resumeTaskDependency.server";
@@ -199,9 +198,6 @@ function getWorkerQueue() {
199198
priority: 0,
200199
maxAttempts: 5,
201200
handler: async (payload, job) => {
202-
const service = new ExecuteTasksWaitingForDeployService();
203-
204-
return await service.call(payload.backgroundWorkerId);
205201
},
206202
},
207203
// @deprecated, moved to ScheduleEngine
@@ -267,7 +263,7 @@ function getWorkerQueue() {
267263
"v3.requeueTaskRun": {
268264
priority: 0,
269265
maxAttempts: 3,
270-
handler: async (payload, job) => {}, // This is now handled by redisWorker
266+
handler: async (payload, job) => { }, // This is now handled by redisWorker
271267
},
272268
// @deprecated, moved to commonWorker.server.ts
273269
"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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { WorkerDeployment } from "@trigger.dev/database";
22
import { BaseService, ServiceValidationError } from "./baseService.server";
3-
import { ExecuteTasksWaitingForDeployService } from "./executeTasksWaitingForDeploy";
43
import { compareDeploymentVersions } from "../utils/deploymentVersions";
54
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/isomorphic";
65

@@ -95,7 +94,5 @@ export class ChangeCurrentDeploymentService extends BaseService {
9594
deploymentId: deployment.id,
9695
},
9796
});
98-
99-
await ExecuteTasksWaitingForDeployService.enqueue(deployment.workerId);
10097
}
10198
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { updateEnvConcurrencyLimits } from "../runQueue.server";
77
import { PerformDeploymentAlertsService } from "./alerts/performDeploymentAlerts.server";
88
import { BaseService } from "./baseService.server";
99
import { createWorkerResources, syncDeclarativeSchedules } from "./createBackgroundWorker.server";
10-
import { ExecuteTasksWaitingForDeployService } from "./executeTasksWaitingForDeploy";
1110
import { projectPubSub } from "./projectPubSub.server";
1211
import { TimeoutDeploymentService } from "./timeoutDeployment.server";
1312
import { CURRENT_DEPLOYMENT_LABEL, BackgroundWorkerId } from "@trigger.dev/core/v3/isomorphic";
@@ -162,7 +161,6 @@ export class CreateDeploymentBackgroundWorkerServiceV3 extends BaseService {
162161
});
163162
}
164163

165-
await ExecuteTasksWaitingForDeployService.enqueue(backgroundWorker.id);
166164
await PerformDeploymentAlertsService.enqueue(deployment.id);
167165
await TimeoutDeploymentService.dequeue(deployment.id, this._prisma);
168166

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

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

0 commit comments

Comments
 (0)