Skip to content

When deploying, batch the "Waiting for deploy runs #1693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2025
Merged

When deploying, batch the "Waiting for deploy runs #1693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions apps/webapp/app/env.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,9 @@ const EnvironmentSchema = z.object({
.default(process.env.REDIS_TLS_DISABLED ?? "false"),
LEGACY_RUN_ENGINE_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),

LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_SIZE: z.coerce.number().int().default(100),
LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_STAGGER_MS: z.coerce.number().int().default(1_000),

COMMON_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
COMMON_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
COMMON_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
Expand Down
77 changes: 35 additions & 42 deletions apps/webapp/app/v3/services/executeTasksWaitingForDeploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { workerQueue } from "~/services/worker.server";
import { marqs } from "~/v3/marqs/index.server";
import { BaseService } from "./baseService.server";
import { logger } from "~/services/logger.server";
import { env } from "~/env.server";

export class ExecuteTasksWaitingForDeployService extends BaseService {
public async call(backgroundWorkerId: string) {
Expand All @@ -17,7 +18,11 @@ export class ExecuteTasksWaitingForDeployService extends BaseService {
organization: true,
},
},
tasks: true,
tasks: {
select: {
slug: true,
},
},
},
});

Expand All @@ -26,6 +31,8 @@ export class ExecuteTasksWaitingForDeployService extends BaseService {
return;
}

const maxCount = env.LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_SIZE;

const runsWaitingForDeploy = await this._prisma.taskRun.findMany({
where: {
runtimeEnvironmentId: backgroundWorker.runtimeEnvironmentId,
Expand All @@ -36,8 +43,16 @@ export class ExecuteTasksWaitingForDeployService extends BaseService {
},
},
orderBy: {
number: "asc",
createdAt: "asc",
},
select: {
id: true,
status: true,
taskIdentifier: true,
concurrencyKey: true,
queue: true,
},
take: maxCount + 1,
});

if (!runsWaitingForDeploy.length) {
Expand All @@ -63,50 +78,28 @@ export class ExecuteTasksWaitingForDeployService extends BaseService {
});
}

if (!marqs) {
return;
}

const enqueues: Promise<any>[] = [];
let i = 0;

for (const run of runsWaitingForDeploy) {
enqueues.push(
marqs.enqueueMessage(
backgroundWorker.runtimeEnvironment,
run.queue,
run.id,
{
type: "EXECUTE",
taskIdentifier: run.taskIdentifier,
projectId: backgroundWorker.runtimeEnvironment.projectId,
environmentId: backgroundWorker.runtimeEnvironment.id,
environmentType: backgroundWorker.runtimeEnvironment.type,
},
run.concurrencyKey ?? undefined,
Date.now() + i * 5 // slight delay to help preserve order
)
await marqs?.enqueueMessage(
backgroundWorker.runtimeEnvironment,
run.queue,
run.id,
{
type: "EXECUTE",
taskIdentifier: run.taskIdentifier,
projectId: backgroundWorker.runtimeEnvironment.projectId,
environmentId: backgroundWorker.runtimeEnvironment.id,
environmentType: backgroundWorker.runtimeEnvironment.type,
},
run.concurrencyKey ?? undefined
);

i++;
}

const settled = await Promise.allSettled(enqueues);

if (settled.some((s) => s.status === "rejected")) {
const rejectedRuns: { id: string; reason: any }[] = [];

runsWaitingForDeploy.forEach((run, i) => {
if (settled[i].status === "rejected") {
const rejected = settled[i] as PromiseRejectedResult;

rejectedRuns.push({ id: run.id, reason: rejected.reason });
}
});

logger.error("Failed to requeue task runs for immediate execution", {
rejectedRuns,
});
if (runsWaitingForDeploy.length > maxCount) {
await ExecuteTasksWaitingForDeployService.enqueue(
backgroundWorkerId,
this._prisma,
new Date(Date.now() + env.LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_STAGGER_MS)
);
}
}

Expand Down