Skip to content

Improve worker deployment queries #1616

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 3 commits into from
Jan 15, 2025
Merged

Improve worker deployment queries #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c95c68c
workerDeployment change findUnique to findFirst
matt-aitken Jan 15, 2025
74692a2
Changed the worker deployment queries to only select what they need, …
matt-aitken Jan 15, 2025
6067088
Only get the bare minimum data for tasks too
matt-aitken Jan 15, 2025
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
7 changes: 5 additions & 2 deletions apps/webapp/app/presenters/v3/TestTaskPresenter.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { BackgroundWorkerTask, RuntimeEnvironmentType, TaskRunStatus } from "@tr
import { PrismaClient, prisma, sqlDatabaseSchema } from "~/db.server";
import { getTimezones } from "~/utils/timezones.server";
import { getUsername } from "~/utils/username";
import { findCurrentWorkerDeployment } from "~/v3/models/workerDeployment.server";
import {
BackgroundWorkerTaskSlim,
findCurrentWorkerDeployment,
} from "~/v3/models/workerDeployment.server";

type TestTaskOptions = {
userId: string;
Expand Down Expand Up @@ -113,7 +116,7 @@ export class TestTaskPresenter {
},
});

let task: BackgroundWorkerTask | null = null;
let task: BackgroundWorkerTaskSlim | null = null;
if (environment.type !== "DEVELOPMENT") {
const deployment = await findCurrentWorkerDeployment(environment.id);
if (deployment) {
Expand Down
71 changes: 57 additions & 14 deletions apps/webapp/app/v3/models/workerDeployment.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,44 @@ export type CurrentWorkerDeployment = Prettify<
NonNullable<Awaited<ReturnType<typeof findCurrentWorkerDeployment>>>
>;

export type BackgroundWorkerTaskSlim = Prisma.BackgroundWorkerTaskGetPayload<{
select: {
id: true;
friendlyId: true;
slug: true;
filePath: true;
exportName: true;
triggerSource: true;
machineConfig: true;
maxDurationInSeconds: true;
};
}>;

type WorkerDeploymentWithWorkerTasks = Prisma.WorkerDeploymentGetPayload<{
include: {
select: {
id: true;
imageReference: true;
version: true;
worker: {
include: {
tasks: true;
select: {
id: true;
friendlyId: true;
version: true;
sdkVersion: true;
cliVersion: true;
supportsLazyAttempts: true;
tasks: {
select: {
id: true;
friendlyId: true;
slug: true;
filePath: true;
exportName: true;
triggerSource: true;
machineConfig: true;
maxDurationInSeconds: true;
};
};
};
};
};
Expand All @@ -21,18 +54,25 @@ type WorkerDeploymentWithWorkerTasks = Prisma.WorkerDeploymentGetPayload<{
export async function findCurrentWorkerDeployment(
environmentId: string
): Promise<WorkerDeploymentWithWorkerTasks | undefined> {
const promotion = await prisma.workerDeploymentPromotion.findUnique({
const promotion = await prisma.workerDeploymentPromotion.findFirst({
where: {
environmentId_label: {
environmentId,
label: CURRENT_DEPLOYMENT_LABEL,
},
environmentId,
label: CURRENT_DEPLOYMENT_LABEL,
},
include: {
select: {
deployment: {
include: {
select: {
id: true,
imageReference: true,
version: true,
worker: {
include: {
select: {
id: true,
friendlyId: true,
version: true,
sdkVersion: true,
cliVersion: true,
supportsLazyAttempts: true,
tasks: true,
},
},
Expand All @@ -46,7 +86,10 @@ export async function findCurrentWorkerDeployment(

export async function findCurrentWorkerFromEnvironment(
environment: Pick<AuthenticatedEnvironment, "id" | "type">
): Promise<BackgroundWorker | null> {
): Promise<Pick<
BackgroundWorker,
"id" | "friendlyId" | "version" | "sdkVersion" | "cliVersion" | "supportsLazyAttempts"
> | null> {
if (environment.type === "DEVELOPMENT") {
const latestDevWorker = await prisma.backgroundWorker.findFirst({
where: {
Expand All @@ -66,7 +109,7 @@ export async function findCurrentWorkerFromEnvironment(
export async function getWorkerDeploymentFromWorker(
workerId: string
): Promise<WorkerDeploymentWithWorkerTasks | undefined> {
const worker = await prisma.backgroundWorker.findUnique({
const worker = await prisma.backgroundWorker.findFirst({
where: {
id: workerId,
},
Expand All @@ -91,7 +134,7 @@ export async function getWorkerDeploymentFromWorker(
export async function getWorkerDeploymentFromWorkerTask(
workerTaskId: string
): Promise<WorkerDeploymentWithWorkerTasks | undefined> {
const workerTask = await prisma.backgroundWorkerTask.findUnique({
const workerTask = await prisma.backgroundWorkerTask.findFirst({
where: {
id: workerTaskId,
},
Expand Down
Loading