feat(core): Coordinate manual workflow activation and deactivation in multi-main scenario

packages/cli/src/ActivationErrors.service.ts

@@ -0,0 +1,52 @@
+import { Service } from 'typedi';
+import { CacheService } from './services/cache.service';
+import { jsonParse } from 'n8n-workflow';
+
+type ActivationErrors = {
+	[workflowId: string]: string; // error message
+};
+
+@Service()
+export class ActivationErrorsService {
+	private readonly cacheKey = 'workflow-activation-errors';
+
+	constructor(private readonly cacheService: CacheService) {}
+
+	async set(workflowId: string, errorMessage: string) {
+		const errors = await this.getAll();
+
+		errors[workflowId] = errorMessage;
+
+		await this.cacheService.set(this.cacheKey, JSON.stringify(errors));
+	}
+
+	async unset(workflowId: string) {
+		const errors = await this.getAll();
+
+		if (Object.keys(errors).length === 0) return;
+
+		delete errors[workflowId];
+
+		await this.cacheService.set(this.cacheKey, JSON.stringify(errors));
+	}
+
+	async get(workflowId: string) {
+		const errors = await this.getAll();
+
+		if (Object.keys(errors).length === 0) return null;
+
+		return errors[workflowId];
+	}
+
+	async getAll() {
+		const errors = await this.cacheService.get<string>(this.cacheKey);
+
+		if (!errors) return {};
+
+		return jsonParse<ActivationErrors>(errors);
+	}
+
+	async clearAll() {
+		await this.cacheService.delete(this.cacheKey);
+	}
+}

packages/cli/src/ActiveWorkflowRunner.ts

@@ -2,8 +2,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 
-import Container, { Service } from 'typedi';
+import { Service } from 'typedi';
 import { ActiveWorkflows, NodeExecuteFunctions } from 'n8n-core';
+import config from '@/config';
 
 import type {
 	ExecutionError,
@@ -64,8 +65,8 @@ import { WebhookService } from './services/webhook.service';
 import { Logger } from './Logger';
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
-import config from '@/config';
-import type { MultiMainInstancePublisher } from './services/orchestration/main/MultiMainInstance.publisher.ee';
+import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';
+import { ActivationErrorsService } from '@/ActivationErrors.service';
 
 const WEBHOOK_PROD_UNREGISTERED_HINT =
 	"The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
@@ -74,15 +75,6 @@ const WEBHOOK_PROD_UNREGISTERED_HINT =
 export class ActiveWorkflowRunner implements IWebhookManager {
 	activeWorkflows = new ActiveWorkflows();
 
-	private activationErrors: {
-		[workflowId: string]: {
-			time: number; // ms
-			error: {
-				message: string;
-			};
-		};
-	} = {};
-
 	private queuedActivations: {
 		[workflowId: string]: {
 			activationMode: WorkflowActivateMode;
@@ -92,11 +84,6 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 		};
 	} = {};
 
-	isMultiMainScenario =
-		config.getEnv('executions.mode') === 'queue' && config.getEnv('leaderSelection.enabled');
-
-	multiMainInstancePublisher: MultiMainInstancePublisher | undefined;
-
 	constructor(
 		private readonly logger: Logger,
 		private readonly activeExecutions: ActiveExecutions,
@@ -105,17 +92,13 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 		private readonly webhookService: WebhookService,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly multiMainSetup: MultiMainSetup,
+		private readonly activationErrorsService: ActivationErrorsService,
 	) {}
 
 	async init() {
-		if (this.isMultiMainScenario) {
-			const { MultiMainInstancePublisher } = await import(
-				'@/services/orchestration/main/MultiMainInstance.publisher.ee'
-			);
-
-			this.multiMainInstancePublisher = Container.get(MultiMainInstancePublisher);
-
-			await this.multiMainInstancePublisher.init();
+		if (config.getEnv('executions.mode') === 'queue' && config.getEnv('multiMainSetup.enabled')) {
+			await this.multiMainSetup.init();
 		}
 
 		await this.addActiveWorkflows('init');
@@ -272,6 +255,8 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	async allActiveInStorage(user?: User) {
 		const isFullAccess = !user || user.globalRole.name === 'owner';
 
+		const activationErrors = await this.activationErrorsService.getAll();
+
 		if (isFullAccess) {
 			const activeWorkflows = await this.workflowRepository.find({
 				select: ['id'],
@@ -280,7 +265,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 
 			return activeWorkflows
 				.map((workflow) => workflow.id)
-				.filter((workflowId) => !this.activationErrors[workflowId]);
+				.filter((workflowId) => !activationErrors[workflowId]);
 		}
 
 		const where = whereClause({
@@ -304,7 +289,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 
 		return sharings
 			.map((sharing) => sharing.workflowId)
-			.filter((workflowId) => !this.activationErrors[workflowId]);
+			.filter((workflowId) => !activationErrors[workflowId]);
 	}
 
 	/**
@@ -325,8 +310,8 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 	/**
 	 * Return error if there was a problem activating the workflow
 	 */
-	getActivationError(workflowId: string) {
-		return this.activationErrors[workflowId];
+	async getActivationError(workflowId: string) {
+		return this.activationErrorsService.get(workflowId);
 	}
 
 	/**
@@ -612,12 +597,8 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 				// Remove the workflow as "active"
 
 				void this.activeWorkflows.remove(workflowData.id);
-				this.activationErrors[workflowData.id] = {
-					time: new Date().getTime(),
-					error: {
-						message: error.message,
-					},
-				};
+
+				void this.activationErrorsService.set(workflowData.id, error.message);
 
 				// Run Error Workflow if defined
 				const activationError = new WorkflowActivationError(
@@ -709,15 +690,15 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 		this.logger.verbose('Finished activating workflows (startup)');
 	}
 
-	async addAllTriggerAndPollerBasedWorkflows() {
-		this.logger.debug('[Leadership change] Adding all trigger- and poller-based workflows...');
+	async clearAllActivationErrors() {
+		await this.activationErrorsService.clearAll();
+	}
 
+	async addAllTriggerAndPollerBasedWorkflows() {
 		await this.addActiveWorkflows('leadershipChange');
 	}
 
 	async removeAllTriggerAndPollerBasedWorkflows() {
-		this.logger.debug('[Leadership change] Removing all trigger- and poller-based workflows...');
-
 		await this.activeWorkflows.removeAllTriggerAndPollerBasedWorkflows();
 	}
 
@@ -750,12 +731,12 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 		let shouldAddWebhooks = true;
 		let shouldAddTriggersAndPollers = true;
 
-		if (this.isMultiMainScenario && activationMode !== 'leadershipChange') {
-			shouldAddWebhooks = this.multiMainInstancePublisher?.isLeader ?? false;
-			shouldAddTriggersAndPollers = this.multiMainInstancePublisher?.isLeader ?? false;
+		if (this.multiMainSetup.isEnabled && activationMode !== 'leadershipChange') {
+			shouldAddWebhooks = this.multiMainSetup.isLeader;
+			shouldAddTriggersAndPollers = this.multiMainSetup.isLeader;
 		}
 
-		if (this.isMultiMainScenario && activationMode === 'leadershipChange') {
+		if (this.multiMainSetup.isEnabled && activationMode === 'leadershipChange') {
 			shouldAddWebhooks = false;
 			shouldAddTriggersAndPollers = true;
 		}
@@ -795,17 +776,13 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 			const additionalData = await WorkflowExecuteAdditionalData.getBase(sharing.user.id);
 
 			if (shouldAddWebhooks) {
-				this.logger.debug('============');
-				this.logger.debug(`Adding webhooks for workflow "${dbWorkflow.display()}"`);
-				this.logger.debug('============');
+				this.logger.debug(`Adding webhooks for workflow ${dbWorkflow.display()}`);
 
 				await this.addWebhooks(workflow, additionalData, 'trigger', activationMode);
 			}
 
 			if (shouldAddTriggersAndPollers) {
-				this.logger.debug('============');
-				this.logger.debug(`Adding triggers and pollers for workflow "${dbWorkflow.display()}"`);
-				this.logger.debug('============');
+				this.logger.debug(`Adding triggers and pollers for workflow ${dbWorkflow.display()}`);
 
 				await this.addTriggersAndPollers(dbWorkflow, workflow, {
 					activationMode,
@@ -817,21 +794,15 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 			// Workflow got now successfully activated so make sure nothing is left in the queue
 			this.removeQueuedWorkflowActivation(workflowId);
 
-			if (this.activationErrors[workflowId]) {
-				delete this.activationErrors[workflowId];
-			}
+			await this.activationErrorsService.unset(workflowId);
 
 			const triggerCount = this.countTriggers(workflow, additionalData);
 			await WorkflowsService.updateWorkflowTriggerCount(workflow.id, triggerCount);
-		} catch (error) {
-			this.activationErrors[workflowId] = {
-				time: new Date().getTime(),
-				error: {
-					message: error.message,
-				},
-			};
+		} catch (e) {
+			const error = e instanceof Error ? e : new Error(`${e}`);
+			await this.activationErrorsService.set(workflowId, error.message);
 
-			throw error;
+			throw e;
 		}
 
 		// If for example webhooks get created it sometimes has to save the
@@ -950,10 +921,7 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 			);
 		}
 
-		if (this.activationErrors[workflowId] !== undefined) {
-			// If there were any activation errors delete them
-			delete this.activationErrors[workflowId];
-		}
+		await this.activationErrorsService.unset(workflowId);
 
 		if (this.queuedActivations[workflowId] !== undefined) {
 			this.removeQueuedWorkflowActivation(workflowId);
@@ -1016,4 +984,8 @@ export class ActiveWorkflowRunner implements IWebhookManager {
 			});
 		}
 	}
+
+	async removeActivationError(workflowId: string) {
+		await this.activationErrorsService.unset(workflowId);
+	}
 }

packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts

@@ -19,7 +19,7 @@ import {
 import { License } from '@/License';
 import { InternalHooks } from '@/InternalHooks';
 import { ExternalSecretsProviders } from './ExternalSecretsProviders.ee';
-import { SingleMainInstancePublisher } from '@/services/orchestration/main/SingleMainInstance.publisher';
+import { SingleMainSetup } from '@/services/orchestration/main/SingleMainSetup';
 
 @Service()
 export class ExternalSecretsManager {
@@ -82,7 +82,7 @@ export class ExternalSecretsManager {
 	}
 
 	async broadcastReloadExternalSecretsProviders() {
-		await Container.get(SingleMainInstancePublisher).broadcastReloadExternalSecretsProviders();
+		await Container.get(SingleMainSetup).broadcastReloadExternalSecretsProviders();
 	}
 
 	private decryptSecretsSettings(value: string): ExternalSecretsSettings {

packages/cli/src/Interfaces.ts

@@ -297,6 +297,7 @@ export interface IDiagnosticInfo {
 	ldap_allowed: boolean;
 	saml_enabled: boolean;
 	binary_data_s3: boolean;
+	multi_main_setup_enabled: boolean;
 	licensePlanName?: string;
 	licenseTenantId?: number;
 }
@@ -468,7 +469,25 @@ export type IPushData =
 	| PushDataNodeDescriptionUpdated
 	| PushDataExecutionRecovered
 	| PushDataActiveWorkflowUsersChanged
-	| PushDataWorkerStatusMessage;
+	| PushDataWorkerStatusMessage
+	| PushDataWorkflowActivated
+	| PushDataWorkflowDeactivated
+	| PushDataWorkflowFailedToActivate;
+
+type PushDataWorkflowFailedToActivate = {
+	data: IWorkflowFailedToActivate;
+	type: 'workflowFailedToActivate';
+};
+
+type PushDataWorkflowActivated = {
+	data: IActiveWorkflowChanged;
+	type: 'workflowActivated';
+};
+
+type PushDataWorkflowDeactivated = {
+	data: IActiveWorkflowChanged;
+	type: 'workflowDeactivated';
+};
 
 type PushDataActiveWorkflowUsersChanged = {
 	data: IActiveWorkflowUsersChanged;
@@ -535,11 +554,24 @@ export interface IActiveWorkflowUser {
 	lastSeen: Date;
 }
 
+export interface IActiveWorkflowAdded {
+	workflowId: Workflow['id'];
+}
+
 export interface IActiveWorkflowUsersChanged {
 	workflowId: Workflow['id'];
 	activeUsers: IActiveWorkflowUser[];
 }
 
+interface IActiveWorkflowChanged {
+	workflowId: Workflow['id'];
+}
+
+interface IWorkflowFailedToActivate {
+	workflowId: Workflow['id'];
+	errorMessage: string;
+}
+
 export interface IPushDataExecutionRecovered {
 	executionId: string;
 }