Update the default env var concurrency limit and set them when orgs and envs are created

Author: ericallam

apps/webapp/app/models/organization.server.ts

@@ -11,6 +11,7 @@ import { prisma, PrismaClientOrTransaction } from "~/db.server";
 import { createProject } from "./project.server";
 import { generate } from "random-words";
 import { createApiKeyForEnv, createPkApiKeyForEnv, envSlug } from "./api-key.server";
+import { env } from "~/env.server";
 
 export type { Organization };
 
@@ -62,6 +63,7 @@ export async function createOrganization(
       title,
       slug: uniqueOrgSlug,
       companySize,
+      maximumConcurrencyLimit: env.DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT,
       members: {
         create: {
           userId: userId,
@@ -103,6 +105,7 @@ export async function createEnvironment(
       pkApiKey,
       shortcode,
       autoEnableInternalSources: type !== "DEVELOPMENT",
+      maximumConcurrencyLimit: env.DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT,
       organization: {
         connect: {
           id: organization.id,

apps/webapp/app/v3/services/createBackgroundWorker.server.ts

@@ -91,10 +91,10 @@ export class CreateBackgroundWorkerService extends BaseService {
             error:
               err instanceof Error
                 ? {
-                    name: err.name,
-                    message: err.message,
-                    stack: err.stack,
-                  }
+                  name: err.name,
+                  message: err.message,
+                  stack: err.stack,
+                }
                 : err,
             project,
             environment,
@@ -141,13 +141,13 @@ export async function createBackgroundTasks(
       const concurrencyLimit =
         typeof task.queue?.concurrencyLimit === "number"
           ? Math.max(
-              Math.min(
-                task.queue.concurrencyLimit,
-                environment.maximumConcurrencyLimit,
-                environment.organization.maximumConcurrencyLimit
-              ),
-              0
-            )
+            Math.min(
+              task.queue.concurrencyLimit,
+              environment.maximumConcurrencyLimit,
+              environment.organization.maximumConcurrencyLimit
+            ),
+            0
+          )
           : null;
 
       const taskQueue = await prisma.taskQueue.upsert({

packages/database/prisma/migrations/20240402105424_set_default_env_concurrency_limit_to_5/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "RuntimeEnvironment" ALTER COLUMN "maximumConcurrencyLimit" SET DEFAULT 5;

packages/database/prisma/schema.prisma

@@ -354,7 +354,7 @@ model RuntimeEnvironment {
   ///A memorable code for the environment
   shortcode String
 
-  maximumConcurrencyLimit Int @default(10)
+  maximumConcurrencyLimit Int @default(5)
 
   autoEnableInternalSources Boolean @default(true)