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

fix(core): Ensure remove-triggers-and-pollers command is not debounced #11486

Merged
merged 2 commits into from
Oct 31, 2024
Merged

fix(core): Ensure remove-triggers-and-pollers command is not debounced #11486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d307e2
fix(core): Ensure `add-webhooks-triggers-and-pollers` command is debo…
ivov Oct 31, 2024
af35fae
Address feedback
ivov Oct 31, 2024
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
36 changes: 36 additions & 0 deletions packages/cli/src/scaling/__tests__/publisher.service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,42 @@ describe('Publisher', () => {
JSON.stringify({ ...msg, senderId: hostId, selfSend: false, debounce: true }),
);
});

it('should not debounce `add-webhooks-triggers-and-pollers`', async () => {
const publisher = new Publisher(logger, redisClientService, instanceSettings);
const msg = mock<PubSub.Command>({ command: 'add-webhooks-triggers-and-pollers' });

await publisher.publishCommand(msg);

expect(client.publish).toHaveBeenCalledWith(
'n8n.commands',
JSON.stringify({
...msg,
_isMockObject: true,
senderId: hostId,
selfSend: true,
debounce: false,
}),
);
});

it('should not debounce `remove-triggers-and-pollers`', async () => {
const publisher = new Publisher(logger, redisClientService, instanceSettings);
const msg = mock<PubSub.Command>({ command: 'remove-triggers-and-pollers' });

await publisher.publishCommand(msg);

expect(client.publish).toHaveBeenCalledWith(
'n8n.commands',
JSON.stringify({
...msg,
_isMockObject: true,
senderId: hostId,
selfSend: true,
debounce: false,
}),
);
});
});

describe('publishWorkerResponse', () => {
Expand Down
7 changes: 5 additions & 2 deletions packages/cli/src/scaling/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type { PubSub } from './pubsub/pubsub.types';

export const QUEUE_NAME = 'jobs';

export const JOB_TYPE_NAME = 'job';
Expand All @@ -11,7 +13,7 @@ export const WORKER_RESPONSE_PUBSUB_CHANNEL = 'n8n.worker-response';
/**
* Commands that should be sent to the sender as well, e.g. during workflow activation and
* deactivation in multi-main setup. */
export const SELF_SEND_COMMANDS = new Set([
export const SELF_SEND_COMMANDS = new Set<PubSub.Command['command']>([
'add-webhooks-triggers-and-pollers',
'remove-triggers-and-pollers',
]);
Expand All @@ -20,7 +22,8 @@ export const SELF_SEND_COMMANDS = new Set([
* Commands that should not be debounced when received, e.g. during webhook handling in
* multi-main setup.
*/
export const IMMEDIATE_COMMANDS = new Set([
export const IMMEDIATE_COMMANDS = new Set<PubSub.Command['command']>([
'add-webhooks-triggers-and-pollers',
'remove-triggers-and-pollers',
'relay-execution-lifecycle-event',
]);
Loading