Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .server-changes/fix-rollback-schedule-sync.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
area: webapp
type: fix
---

Sync declarative schedules when rolling back or promoting deployments
67 changes: 58 additions & 9 deletions apps/webapp/app/v3/services/changeCurrentDeployment.server.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { tryCatch } from "@trigger.dev/core/v3";
import { BackgroundWorkerMetadata, tryCatch } from "@trigger.dev/core/v3";
import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/isomorphic";
import { WorkerDeployment } from "@trigger.dev/database";
import { logger } from "~/services/logger.server";
import { syncTaskIdentifiers } from "~/services/taskIdentifierRegistry.server";
import { BaseService, ServiceValidationError } from "./baseService.server";
import { syncDeclarativeSchedules } from "./createBackgroundWorker.server";
import { ExecuteTasksWaitingForDeployService } from "./executeTasksWaitingForDeploy";
import { compareDeploymentVersions } from "../utils/deploymentVersions";

Expand Down Expand Up @@ -53,10 +54,8 @@ export class ChangeCurrentDeploymentService extends BaseService {
switch (direction) {
case "promote": {
if (
compareDeploymentVersions(
currentPromotion.deployment.version,
deployment.version
) >= 0
compareDeploymentVersions(currentPromotion.deployment.version, deployment.version) >=
0
) {
throw new ServiceValidationError(
"Cannot promote a deployment that is older than the current deployment."
Expand All @@ -66,10 +65,8 @@ export class ChangeCurrentDeploymentService extends BaseService {
}
case "rollback": {
if (
compareDeploymentVersions(
currentPromotion.deployment.version,
deployment.version
) <= 0
compareDeploymentVersions(currentPromotion.deployment.version, deployment.version) <=
0
) {
throw new ServiceValidationError(
"Cannot rollback to a deployment that is newer than the current deployment."
Expand Down Expand Up @@ -118,6 +115,58 @@ export class ChangeCurrentDeploymentService extends BaseService {
logger.error("Error syncing task identifiers on deployment change", { error: syncError });
}

const [scheduleSyncError] = await tryCatch(this.#syncSchedulesForDeployment(deployment));

if (scheduleSyncError) {
logger.error("Error syncing declarative schedules on deployment change", {
error: scheduleSyncError,
});
}

await ExecuteTasksWaitingForDeployService.enqueue(deployment.workerId);
}

async #syncSchedulesForDeployment(deployment: WorkerDeployment) {
const worker = await this._prisma.backgroundWorker.findFirst({
where: { id: deployment.workerId! },
});

if (!worker) {
logger.error("Worker not found for deployment schedule sync", {
deploymentId: deployment.id,
workerId: deployment.workerId,
});
return;
}

const parsed = BackgroundWorkerMetadata.safeParse(worker.metadata);

if (!parsed.success) {
logger.error("Failed to parse worker metadata for schedule sync", {
deploymentId: deployment.id,
workerId: deployment.workerId,
error: parsed.error,
});
return;
}

const environment = await this._prisma.runtimeEnvironment.findFirst({
where: { id: deployment.environmentId },
include: {
project: true,
organization: true,
orgMember: true,
},
});

if (!environment) {
logger.error("Environment not found for deployment schedule sync", {
deploymentId: deployment.id,
environmentId: deployment.environmentId,
});
return;
}

await syncDeclarativeSchedules(parsed.data.tasks, worker, environment, this._prisma);
}
}
Loading