Eric Allam
2b3ea692fe
* WIP * Run queue now works with the worker queue / master queue split * Acking should also cause the master queue to be processed * Convert run engine tests and run engine to use runQueue changes * Include the util files in the test tsconfig * coordinator target should be es2020 as well * providers target 2020 * Fix the triggerTask tests in the webapp * v4 now working with the new worker queues, and added the legacy master queue migration stuff * report worker queue lengths via opentelemetry metrics * Adding lock metrics * Release concurrency bucket metrics * • Updated RunQueue.removeEnvironmentQueuesFromMasterQueue() method signature to take runtimeEnvironmentId instead of masterQueue parameter • Added automatic master queue shard calculation using this.keys.masterQueueKeyForEnvironment(runtimeEnvironmentId, this.shardCount) • Updated RunEngine wrapper method to use new runtimeEnvironmentId parameter • Updated DeleteProjectService to call the method once per environment instead of once per master queue • Simplified API by encapsulating master queue sharding logic within RunQueue class * metrics now working, configure the run queue settings, additional metrics for run engine and redis-worker * Fix CodeRabbit suggestions * return undefined from dequeueFromWorkerQueue, not null * Remove message from worker queue in certain circumstances when acking * Update log * Ensure master queue consumers cannot stop from a processing error, and make the consumer interval configurable via an env var * Change how the run queue master queue consumers are disabled internally * Fixed tests * process the queue on nack * Fix more tests * Fix priority tests * Fixed dequeueing test
82 lines
2.1 KiB
TypeScript
82 lines
2.1 KiB
TypeScript
import { PrismaClient } from "@trigger.dev/database";
|
|
import { prisma } from "~/db.server";
|
|
import { marqs } from "~/v3/marqs/index.server";
|
|
import { engine } from "~/v3/runEngine.server";
|
|
|
|
type Options = ({ projectId: string } | { projectSlug: string }) & {
|
|
userId: string;
|
|
};
|
|
|
|
export class DeleteProjectService {
|
|
#prismaClient: PrismaClient;
|
|
|
|
constructor(prismaClient: PrismaClient = prisma) {
|
|
this.#prismaClient = prismaClient;
|
|
}
|
|
|
|
public async call(options: Options) {
|
|
const projectId = await this.#getProjectId(options);
|
|
const project = await this.#prismaClient.project.findFirst({
|
|
include: {
|
|
environments: true,
|
|
organization: true,
|
|
},
|
|
where: {
|
|
id: projectId,
|
|
organization: { members: { some: { userId: options.userId } } },
|
|
},
|
|
});
|
|
|
|
if (!project) {
|
|
throw new Error("Project not found");
|
|
}
|
|
|
|
if (project.deletedAt) {
|
|
return;
|
|
}
|
|
|
|
// Remove queues from MARQS
|
|
for (const environment of project.environments) {
|
|
await marqs?.removeEnvironmentQueuesFromMasterQueue(project.organization.id, environment.id);
|
|
}
|
|
|
|
// Delete all queues from the RunEngine 2 prod master queues
|
|
for (const environment of project.environments) {
|
|
await engine.removeEnvironmentQueuesFromMasterQueue({
|
|
runtimeEnvironmentId: environment.id,
|
|
organizationId: project.organization.id,
|
|
projectId: project.id,
|
|
});
|
|
}
|
|
|
|
// Mark the project as deleted (do this last because it makes it impossible to try again)
|
|
// - This disables all API keys
|
|
// - This disables all schedules from being scheduled
|
|
await this.#prismaClient.project.update({
|
|
where: {
|
|
id: project.id,
|
|
},
|
|
data: {
|
|
deletedAt: new Date(),
|
|
},
|
|
});
|
|
}
|
|
|
|
async #getProjectId(options: Options) {
|
|
if ("projectId" in options) {
|
|
return options.projectId;
|
|
}
|
|
|
|
const { id } = await this.#prismaClient.project.findFirstOrThrow({
|
|
select: {
|
|
id: true,
|
|
},
|
|
where: {
|
|
slug: options.projectSlug,
|
|
},
|
|
});
|
|
|
|
return id;
|
|
}
|
|
}
|