separate db pool for internal operations (#2163)

proofcarryingdata · Nov 12, 2024 · 18c53b0 · 18c53b0
1 parent f33429a
commit 18c53b0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/apps/passport-server/src/application.ts b/apps/passport-server/src/application.ts
@@ -40,10 +40,13 @@ export async function startApplication(
   logger(`[INIT] Starting application in mode ${mode}`);
 
   const dbPool = await getDB();
+  const internalPool = await getDB(10);
+
   const honeyClient = getHoneycombAPI();
 
   const context: ApplicationContext = {
     dbPool,
+    internalPool,
     honeyClient,
     resourcesDir: path.join(process.cwd(), "resources"),
     publicResourcesDir: path.join(process.cwd(), "public"),

diff --git a/apps/passport-server/src/database/postgresConfiguration.ts b/apps/passport-server/src/database/postgresConfiguration.ts
@@ -9,7 +9,9 @@ export interface DBConfiguration extends ClientConfig {
   port: number;
 }
 
-export function getDatabaseConfiguration(): PoolOptionsExplicit & SslSettings {
+export function getDatabaseConfiguration(
+  overwriteMaxConnections?: number
+): PoolOptionsExplicit & SslSettings {
   if (process.env.DATABASE_USERNAME === undefined) {
     throw new Error("Missing environment variable: DATABASE_USERNAME");
   }
@@ -35,6 +37,10 @@ export function getDatabaseConfiguration(): PoolOptionsExplicit & SslSettings {
     poolSize = Math.min(Math.max(poolSize, 32), 500);
   }
 
+  if (overwriteMaxConnections !== undefined) {
+    poolSize = overwriteMaxConnections;
+  }
+
   // defaults here: https://github.com/postgres-pool/postgres-pool/blob/9d623823dc365b5edea3303cab6ae519bfaa94f7/src/index.ts#L264C10-L290
   // docs here: https://github.com/postgres-pool/postgres-pool/blob/9d623823dc365b5edea3303cab6ae519bfaa94f7/src/index.ts#L29-L130
   return {

diff --git a/apps/passport-server/src/database/postgresPool.ts b/apps/passport-server/src/database/postgresPool.ts
@@ -3,11 +3,11 @@ import { logger } from "../util/logger";
 import { getDatabaseConfiguration } from "./postgresConfiguration";
 import { migrateDatabase } from "./postgresMigrations";
 
-export async function getDB(): Promise<Pool> {
+export async function getDB(overwriteMaxConnections?: number): Promise<Pool> {
   logger("[INIT] Initializing Postgres client");
 
   try {
-    const pool = new Pool(getDatabaseConfiguration());
+    const pool = new Pool(getDatabaseConfiguration(overwriteMaxConnections));
     const client = await pool.connect();
     await migrateDatabase(client);
     client.release();

diff --git a/apps/passport-server/src/services/generic-issuance/subservices/PipelineExecutorSubservice.ts b/apps/passport-server/src/services/generic-issuance/subservices/PipelineExecutorSubservice.ts
@@ -101,7 +101,7 @@ export class PipelineExecutorSubservice {
    * schedules a load loop which loads data for each {@link Pipeline} once per minute.
    */
   public async start(startLoadLoop?: boolean): Promise<void> {
-    await sqlTransaction(this.context.dbPool, (client) =>
+    await sqlTransaction(this.context.internalPool, (client) =>
       this.loadAndInstantiatePipelines(client)
     );
 
@@ -357,7 +357,7 @@ export class PipelineExecutorSubservice {
         }
 
         let runInfo = await performPipelineLoad(
-          this.context.dbPool,
+          this.context.internalPool,
           pipelineSlot,
           this.pipelineSubservice,
           this.userSubservice,
@@ -502,7 +502,7 @@ export class PipelineExecutorSubservice {
     // function - that will be done the next time `startPipelineLoadLoop`
     // is called.
     await namedSqlTransaction(
-      this.context.dbPool,
+      this.context.internalPool,
       "startPipelineLoadLoop",
       async (client) => {
         await this.loadAndInstantiatePipelines(client);

diff --git a/apps/passport-server/src/services/semaphoreService.ts b/apps/passport-server/src/services/semaphoreService.ts
@@ -57,7 +57,7 @@ export class SemaphoreService {
   public groupDevconnectOrganizers = (): NamedGroup => this.getNamedGroup("7");
 
   public constructor(config: ApplicationContext) {
-    this.dbPool = config.dbPool;
+    this.dbPool = config.internalPool;
     this.groups = SemaphoreService.createGroups();
   }
 

diff --git a/apps/passport-server/src/types.ts b/apps/passport-server/src/types.ts
@@ -50,6 +50,7 @@ export enum ServerMode {
 
 export interface ApplicationContext {
   dbPool: Pool;
+  internalPool: Pool;
   honeyClient: Libhoney | null;
   resourcesDir: string;
   publicResourcesDir: string;