fix(core): Ensure graceful shutdown for workers #9547
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
netroy
reviewed
May 30, 2024
packages/cli/src/commands/worker.ts
Outdated
Comment on lines
486
to
497
| if (process.stdout.isTTY) { | ||
| process.stdin.setRawMode(true); | ||
| process.stdin.resume(); | ||
| process.stdin.setEncoding('utf8'); | ||
|
|
||
| process.stdin.on('data', (key: string) => { | ||
| // ctrl+c | ||
| if (key.charCodeAt(0) === 3) { | ||
| void this.stopProcess(); | ||
| } | ||
| }); | ||
| } |
There was a problem hiding this comment.
could this be moved to BaseCommand.init ?
There was a problem hiding this comment.
As far as I understand, I think this is only needed for worker and webhook because of their never-resolving promise. start has its own process.stdin listener and I'd rather not change webhook in this PR about workers.
packages/cli/src/commands/worker.ts
Outdated
| @@ -64,22 +64,22 @@ export class Worker extends BaseCommand { | |||
| this.logger.info('Stopping n8n...'); | |||
|
|
|||
| // Stop accepting new jobs | |||
| await Worker.jobQueue.pause(true); | |||
| void Worker.jobQueue.pause(true); // do not block so we can report progress | |||
There was a problem hiding this comment.
can we instead update queue.pause to pass the second argument (doNotWaitActive) as true instead of leaving a dangling promise here?
n8n-assistant
bot
added
core
netroy
approved these changes
May 31, 2024
1 flaky test on run #5214 ↗︎
Details:
|
|||||||||||||||||||||
| Test | Artifacts | |
|---|---|---|
| NDV > should not retrieve remote options when required params throw errors |
Screenshots
Video
|
|
Review all test suite changes for PR #9547 ↗︎
|
✅ All Cypress E2E specs passed |
ivov
deleted the
pay-1580-bug-graceful-shutdown-does-not-seem-to-work-for-workers
branch
ivov
added a commit
that referenced
this pull request
Jun 3, 2024
Merged
|
Got released with |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://linear.app/n8n/issue/PAY-1580