fix(core): Fix worker shutdown errors when active executions #10353
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
ivov
commented
Aug 12, 2024
| @@ -61,23 +61,6 @@ export class Worker extends BaseCommand { | |||
|
|
|||
| try { | |||
| await this.externalHooks?.run('n8n.stop', []); | |||
|
|
|||
| const hardStopTimeMs = Date.now() + this.gracefulShutdownTimeoutInS * 1000; | |||
There was a problem hiding this comment.
Note that this time was misreporting, the graceful shutdown had already started at BaseCommand.onTerminationSignal
n8n-assistant
bot
added
core
|
✅ All Cypress E2E specs passed |
|
Test summaryRun details
Flakiness
This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Cloud |
||||||||||||||||||||||||||
tomi
approved these changes
Aug 13, 2024
Comment on lines
+336
to
+338
| await this.shutdownService.waitForShutdown(); | ||
|
|
||
| await this.stopProcess(); |
There was a problem hiding this comment.
This also changes the shutdown behaviour of the start command. It seems to have some duplication (some functions are called in both ShutdownService and StartCommand.stopProcess(). We should fix that also as a follow-up
|
✅ All Cypress E2E specs passed |
ivov
deleted the
pay-1817-worker-shutdown-errors-out-when-active-executions
branch
MiloradFilipovic
added a commit
that referenced
this pull request
Aug 14, 2024
* master: (98 commits) feat(core): Allow overriding npm registry for community packages (#10325) feat(core): Upgrade DB drivers (no-changelog) (#10370) fix(editor): Fix bug causing workflow debugging to not work in new canvas (no-changelog) (#10384) fix: Fix issue with some errors not being handled correctly (no-changelog) (#10371) fix(core): Filter out prototype and constructor lookups in expressions (#10382) fix(editor): Connect up new project viewer role to the FE (#9913) refactor(core): Move queue recovery to scaling service (no-changelog) (#10368) fix(core): Account for owner when filtering by project ID in `GET /workflows` in Public API (#10379) fix(editor): Fix rendering of SVG icons in public chat on iOS (#10381) fix: Require mfa code to disable mfa (#10345) ci: Disable turbo cache when running tests for coverage collection (no-changelog) (#10380) refactor(editor): Add typed event bus (no-changelog) (#10367) refactor(core): Remove unused constants in Redis channels (no-changelog) (#10369) fix(editor): Revert change that hid swagger docs in the ui (#10350) fix(Okta Node): Add missing codex file (no-changelog) (#10372) fix(core): Fix worker shutdown errors when active executions (#10353) refactor(core): Rename ActiveWebhooks to LiveWebhooks (no-changelog) (#10355) fix(n8n Form Trigger Node): Fix issue preventing v1 node from working (#10364) feat(editor): Upgrade markdown-it to address AIKIDO-2024-10034 (no-changelog) (#10358) ci: Upgrade axios to address CVE-2024-39338 (no-changelog) (#10365) ... # Conflicts: # packages/design-system/package.json
Merged
|
Got released with |
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-1817