fix(core): Tighten checks for multi-main setup usage (#7788)

https://n8nio.slack.com/archives/C05HRPLSGTT/p1700731476321999?thread_ts=1700729359.746899&cid=C05HRPLSGTT
n8n-io · Nov 23, 2023 · fdb2c18 · fdb2c18
1 parent 6208af0
commit fdb2c18
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -4,7 +4,6 @@
 
 import { Service } from 'typedi';
 import { ActiveWorkflows, NodeExecuteFunctions } from 'n8n-core';
-import config from '@/config';
 
 import type {
 	ExecutionError,
@@ -99,9 +98,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	) {}
 
 	async init() {
-		if (config.getEnv('executions.mode') === 'queue' && config.getEnv('multiMainSetup.enabled')) {
-			await this.multiMainSetup.init();
-		}
+		await this.multiMainSetup.init();
 
 		await this.addActiveWorkflows('init');
 

diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts
@@ -51,9 +51,7 @@ export class License {
 			return;
 		}
 
-		if (config.getEnv('executions.mode') === 'queue' && config.getEnv('multiMainSetup.enabled')) {
-			await this.multiMainSetup.init();
-		}
+		await this.multiMainSetup.init();
 
 		const isMainInstance = instanceType === 'main';
 		const server = config.getEnv('license.serverUrl');

diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
@@ -117,7 +117,7 @@ export class Start extends BaseCommand {
 				this.pruningService.stopPruning();
 			}
 
-			if (config.getEnv('executions.mode') === 'queue' && config.getEnv('multiMainSetup.enabled')) {
+			if (Container.get(MultiMainSetup).isEnabled) {
 				await this.activeWorkflowRunner.removeAllTriggerAndPollerBasedWorkflows();
 
 				await Container.get(MultiMainSetup).shutdown();

diff --git a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
@@ -14,6 +14,7 @@ export class MultiMainSetup extends SingleMainSetup {
 		return (
 			config.getEnv('executions.mode') === 'queue' &&
 			config.getEnv('multiMainSetup.enabled') &&
+			config.getEnv('generic.instanceType') === 'main' &&
 			this.isLicensed
 		);
 	}
@@ -37,7 +38,7 @@ export class MultiMainSetup extends SingleMainSetup {
 	private leaderCheckInterval: NodeJS.Timer | undefined;
 
 	async init() {
-		if (this.isInitialized) return;
+		if (!this.isEnabled || this.isInitialized) return;
 
 		await this.initPublisher();
 

diff --git a/packages/cli/src/services/pruning.service.ts b/packages/cli/src/services/pruning.service.ts
@@ -40,6 +40,7 @@ export class PruningService {
 
 		if (
 			config.getEnv('multiMainSetup.enabled') &&
+			config.getEnv('generic.instanceType') === 'main' &&
 			config.getEnv('multiMainSetup.instanceType') === 'follower'
 		) {
 			return false;

diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
@@ -372,19 +372,17 @@ export class WorkflowsService {
 			}
 		}
 
-		if (config.getEnv('executions.mode') === 'queue' && config.getEnv('multiMainSetup.enabled')) {
-			const multiMainSetup = Container.get(MultiMainSetup);
+		const multiMainSetup = Container.get(MultiMainSetup);
 
-			await multiMainSetup.init();
+		await multiMainSetup.init();
 
-			if (multiMainSetup.isEnabled) {
-				await Container.get(MultiMainSetup).broadcastWorkflowActiveStateChanged({
-					workflowId,
-					oldState,
-					newState: updatedWorkflow.active,
-					versionId: shared.workflow.versionId,
-				});
-			}
+		if (multiMainSetup.isEnabled) {
+			await Container.get(MultiMainSetup).broadcastWorkflowActiveStateChanged({
+				workflowId,
+				oldState,
+				newState: updatedWorkflow.active,
+				versionId: shared.workflow.versionId,
+			});
 		}
 
 		return updatedWorkflow;