Remove releaseConcurrency and releaseConcurrencyOnWaitpoint

Also removed deadlock detection, and added environment burst concurrency

Author: ericallam

apps/webapp/app/env.server.ts

@@ -200,6 +200,7 @@ const EnvironmentSchema = z.object({
   PUBSUB_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
 
   DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: z.coerce.number().int().default(100),
+  DEFAULT_ENV_EXECUTION_CONCURRENCY_BURST_FACTOR: z.coerce.number().default(1.0),
   DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: z.coerce.number().int().default(300),
   DEFAULT_DEV_ENV_EXECUTION_ATTEMPTS: z.coerce.number().int().positive().default(1),
 

apps/webapp/app/presenters/v3/QueueListPresenter.server.ts

@@ -116,7 +116,6 @@ export class QueueListPresenter extends BasePresenter {
         concurrencyLimit: true,
         type: true,
         paused: true,
-        releaseConcurrencyOnWaitpoint: true,
       },
       orderBy: {
         orderableName: "asc",
@@ -146,7 +145,6 @@ export class QueueListPresenter extends BasePresenter {
         queued: results[0][queue.name] ?? 0,
         concurrencyLimit: queue.concurrencyLimit ?? null,
         paused: queue.paused,
-        releaseConcurrencyOnWaitpoint: queue.releaseConcurrencyOnWaitpoint,
       })
     );
   }

apps/webapp/app/presenters/v3/QueueRetrievePresenter.server.ts

@@ -76,7 +76,6 @@ export class QueueRetrievePresenter extends BasePresenter {
         queued: results[0]?.[queue.name] ?? 0,
         concurrencyLimit: queue.concurrencyLimit ?? null,
         paused: queue.paused,
-        releaseConcurrencyOnWaitpoint: queue.releaseConcurrencyOnWaitpoint,
       }),
     };
   }
@@ -106,7 +105,6 @@ export function toQueueItem(data: {
   queued: number;
   concurrencyLimit: number | null;
   paused: boolean;
-  releaseConcurrencyOnWaitpoint: boolean;
 }): QueueItem {
   return {
     id: data.friendlyId,
@@ -117,6 +115,7 @@ export function toQueueItem(data: {
     queued: data.queued,
     concurrencyLimit: data.concurrencyLimit,
     paused: data.paused,
-    releaseConcurrencyOnWaitpoint: data.releaseConcurrencyOnWaitpoint,
+    // TODO: This needs to be removed but keeping this here for now to avoid breaking existing clients
+    releaseConcurrencyOnWaitpoint: true,
   };
 }

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx

@@ -10,11 +10,10 @@ import {
 import { DialogClose } from "@radix-ui/react-dialog";
 import {
   Form,
-  useNavigate,
   useNavigation,
   useRevalidator,
   useSearchParams,
-  type MetaFunction,
+  type MetaFunction
 } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { type RuntimeEnvironmentType } from "@trigger.dev/database";
@@ -34,6 +33,8 @@ import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
 import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
 import { FormButtons } from "~/components/primitives/FormButtons";
+import { Header3 } from "~/components/primitives/Headers";
+import { Input } from "~/components/primitives/Input";
 import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
 import { PaginationControls } from "~/components/primitives/Pagination";
 import { Paragraph } from "~/components/primitives/Paragraph";
@@ -58,6 +59,7 @@ import { useEnvironment } from "~/hooks/useEnvironment";
 import { useEventSource } from "~/hooks/useEventSource";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
+import { useThrottle } from "~/hooks/useThrottle";
 import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
 import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
@@ -69,9 +71,6 @@ import { docsPath, EnvironmentParamSchema, v3BillingPath } from "~/utils/pathBui
 import { PauseEnvironmentService } from "~/v3/services/pauseEnvironment.server";
 import { PauseQueueService } from "~/v3/services/pauseQueue.server";
 import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
-import { Header3 } from "~/components/primitives/Headers";
-import { Input } from "~/components/primitives/Input";
-import { useThrottle } from "~/hooks/useThrottle";
 
 const SearchParamsSchema = z.object({
   query: z.string().optional(),
@@ -360,32 +359,6 @@ export default function Page() {
                     >
                       Limited by
                     </TableHeaderCell>
-                    <TableHeaderCell
-                      alignment="right"
-                      tooltip={
-                        <div className="max-w-xs p-1 text-left">
-                          <Paragraph
-                            variant="small"
-                            className="!text-wrap text-text-dimmed"
-                            spacing
-                          >
-                            When a task executing on this queue is paused and waiting for a
-                            waitpoint to complete, the queue will release the concurrency being used
-                            by the run so other runs can be started.
-                          </Paragraph>
-                          <LinkButton
-                            to={docsPath("v3/queues#release-concurrency-on-waitpoint")}
-                            variant="docs/small"
-                            LeadingIcon={BookOpenIcon}
-                            className="mt-3"
-                          >
-                            Read docs
-                          </LinkButton>
-                        </div>
-                      }
-                    >
-                      Release on waitpoint
-                    </TableHeaderCell>
                     <TableHeaderCell className="w-[1%] pl-24">
                       <span className="sr-only">Pause/resume</span>
                     </TableHeaderCell>
@@ -472,12 +445,6 @@ export default function Page() {
                           >
                             {queue.concurrencyLimit ? "User" : "Environment"}
                           </TableCell>
-                          <TableCell
-                            alignment="right"
-                            className={queue.paused ? "opacity-50" : undefined}
-                          >
-                            {queue.releaseConcurrencyOnWaitpoint ? "Yes" : "No"}
-                          </TableCell>
                           <TableCellMenu
                             isSticky
                             visibleButtons={

apps/webapp/app/routes/engine.v1.runs.$runFriendlyId.wait.duration.ts

@@ -50,7 +50,6 @@ const { action } = createActionApiRoute(
         waitpoints: waitpoint.id,
         projectId: authentication.environment.project.id,
         organizationId: authentication.environment.organization.id,
-        releaseConcurrency: body.releaseConcurrency,
       });
 
       return json({

apps/webapp/app/routes/engine.v1.runs.$runFriendlyId.waitpoints.tokens.$waitpointFriendlyId.wait.ts

@@ -13,13 +13,10 @@ const { action } = createActionApiRoute(
       runFriendlyId: z.string(),
       waitpointFriendlyId: z.string(),
     }),
-    body: z.object({
-      releaseConcurrency: z.boolean().optional(),
-    }),
     maxContentLength: 1024 * 10, // 10KB
     method: "POST",
   },
-  async ({ authentication, body, params }) => {
+  async ({ authentication, params }) => {
     // Resume tokens are actually just waitpoints
     const waitpointId = WaitpointId.toId(params.waitpointFriendlyId);
     const runId = RunId.toId(params.runFriendlyId);
@@ -42,7 +39,6 @@ const { action } = createActionApiRoute(
         waitpoints: [waitpointId],
         projectId: authentication.environment.project.id,
         organizationId: authentication.environment.organization.id,
-        releaseConcurrency: body.releaseConcurrency,
       });
 
       return json<WaitForWaitpointTokenResponseBody>(

apps/webapp/app/routes/resources.taskruns.$runParam.debug.ts

@@ -31,6 +31,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
           organizationId: true,
           project: true,
           maximumConcurrencyLimit: true,
+          concurrencyLimitBurstFactor: true,
           organization: {
             select: {
               id: true,
@@ -120,10 +121,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
       run.runtimeEnvironment
     );
 
-    const releaseConcurrencyBucketKey = `engine:release-concurrency:org:${run.runtimeEnvironment.organizationId}:proj:${run.runtimeEnvironment.project.id}:env:${run.runtimeEnvironment.id}:bucket`;
-    const releaseConcurrencyQueueKey = `engine:release-concurrency:org:${run.runtimeEnvironment.organizationId}:proj:${run.runtimeEnvironment.project.id}:env:${run.runtimeEnvironment.id}:queue`;
-    const releaseConcurrencyMetadataKey = `engine:release-concurrency:org:${run.runtimeEnvironment.organizationId}:proj:${run.runtimeEnvironment.project.id}:env:${run.runtimeEnvironment.id}:metadata`;
-
     const withPrefix = (key: string) => `engine:runqueue:${key}`;
 
     const keys = [
@@ -143,22 +140,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
         label: "Env concurrency limit",
         key: withPrefix(envConcurrencyLimitKey),
       },
-      {
-        label: "Release concurrency bucket",
-        key: releaseConcurrencyBucketKey,
-      },
-      {
-        label: "Release concurrency queue",
-        key: releaseConcurrencyQueueKey,
-      },
-      {
-        label: "Release concurrency metadata",
-        key: releaseConcurrencyMetadataKey,
-      },
-      {
-        label: "Release concurrency releasings",
-        key: "engine:release-concurrency:releasings",
-      },
     ];
 
     return typedjson({

apps/webapp/app/runEngine/concerns/idempotencyKeys.server.ts

@@ -81,7 +81,6 @@ export class IdempotencyKeyConcern {
                 projectId: request.environment.projectId,
                 organizationId: request.environment.organizationId,
                 tx: this.prisma,
-                releaseConcurrency: request.body.options?.releaseConcurrency,
               });
             }
           );

apps/webapp/app/runEngine/concerns/queues.server.ts

@@ -27,7 +27,6 @@ export class DefaultQueueManager implements QueueManager {
   ): Promise<QueueProperties> {
     let queueName: string;
     let lockedQueueId: string | undefined;
-    let lockedQueueReleaseConcurrencyOnWaitpoint: boolean | undefined;
 
     // Determine queue name based on lockToVersion and provided options
     if (lockedBackgroundWorker) {
@@ -54,8 +53,6 @@ export class DefaultQueueManager implements QueueManager {
         // Use the validated queue name directly
         queueName = specifiedQueue.name;
         lockedQueueId = specifiedQueue.id;
-        lockedQueueReleaseConcurrencyOnWaitpoint =
-          this.engine.shouldReleaseConcurrencyOnWaitpointForQueue(specifiedQueue);
       } else {
         // No specific queue name provided, use the default queue for the task on the locked worker
         const lockedTask = await this.prisma.backgroundWorkerTask.findFirst({
@@ -94,9 +91,6 @@ export class DefaultQueueManager implements QueueManager {
         // Use the task's default queue name
         queueName = lockedTask.queue.name;
         lockedQueueId = lockedTask.queue.id;
-        lockedQueueReleaseConcurrencyOnWaitpoint =
-          typeof lockedTask.queue.concurrencyLimit === "undefined" ||
-          lockedTask.queue.releaseConcurrencyOnWaitpoint;
       }
     } else {
       // Task is not locked to a specific version, use regular logic
@@ -124,7 +118,6 @@ export class DefaultQueueManager implements QueueManager {
     return {
       queueName,
       lockedQueueId,
-      lockedQueueReleaseConcurrencyOnWaitpoint,
     };
   }