Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Nov 23, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
291f294
fix(core): Tighten checks for multi-main setup usage
ivov Nov 23, 2023
dd5502b
Simplify checks
ivov Nov 23, 2023
49c4150
Fix lint
ivov Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions packages/cli/src/ActiveWorkflowRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import { Service } from 'typedi';
import { ActiveWorkflows, NodeExecuteFunctions } from 'n8n-core';
import config from '@/config';

import type {
ExecutionError,
Expand Down Expand Up @@ -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');

Expand Down
4 changes: 1 addition & 3 deletions packages/cli/src/License.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
}
Expand All @@ -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();

Expand Down
1 change: 1 addition & 0 deletions packages/cli/src/services/pruning.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export class PruningService {

if (
config.getEnv('multiMainSetup.enabled') &&
config.getEnv('generic.instanceType') === 'main' &&
config.getEnv('multiMainSetup.instanceType') === 'follower'
) {
return false;
Expand Down
20 changes: 9 additions & 11 deletions packages/cli/src/workflows/workflows.services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading