fix(core): Fix execution cancellation in scaling mode #9841
+408
−134
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
n8n-assistant
bot
added
core
krynble
reviewed
Jun 24, 2024
| } | ||
|
|
||
| // queue mode | ||
| return await this.executionRepository.stopDuringRun(execution); |
There was a problem hiding this comment.
Shouldn't this be part of the responsibility of activeExecutions rather than being here?
There was a problem hiding this comment.
What I like about the flow right now is that it gives a clear overview of all the calls being made to stop the execution, with everything in a single spot:
ExecutionService.stopInRegularMode
ConcurrencyControl.remove
ExecutionRepository.stopBeforeRun
// or
ActiveExecutions.stopExecution
WaitTracker.stopExecution
ExecutionRepository.stopDuringRun
ExecutionService.stopInScalingMode
ExecutionService.stopInRegularMode
// or
WaitTracker.stopExecution
this.queue.stopJob
ExecutionRepository.stopDuringRun
If we moved ExecutionRepository.stopDuringRun
- this would require more navigation to see the full picture and
ExecutionRepository.stopBeforeRunwould still remain inExecutionServiceunless we also move that toConcurrencyControl.remove
ExecutionService.stopInRegularMode
ConcurrencyControl.remove
// or
ActiveExecutions.stopExecution
WaitTracker.stopExecution
ExecutionService.stopInScalingMode
ExecutionService.stopInRegularMode
// or
WaitTracker.stopExecution
this.queue.stopJob
The root issue in my eyes is that there is no clear distinction between what ExecutionService and what ActiveExecutions should be responsible for. Until we differentiate them better, I'd find the former flow easier to debug.
| return await this.waitTracker.stopExecution(execution.id); | ||
| } catch { | ||
| // @TODO: Why are we swallowing this error in queue mode? | ||
| private async stopInScalingMode(execution: IExecutionResponse) { |
There was a problem hiding this comment.
What if it's a manual execution? In this case it would be viewable in activeExecutions and can be cancelled from there.
netroy
approved these changes
Jun 27, 2024
3 flaky tests on run #5720 ↗︎
Details:
|
||||||||||||||||||||||||||||||
| Test | Artifacts | |
|---|---|---|
| NDV > should not retrieve remote options when required params throw errors |
Screenshots
Video
|
|
| NDV > Stop listening for trigger event from NDV |
Screenshots
Video
|
|
24-ndv-paired-item.cy.ts • 1 flaky test
| Test | Artifacts | |
|---|---|---|
| NDV > resolves expression with default item when input node is not parent, while still pairing items |
Test Replay
Screenshots
Video
|
|
Review all test suite changes for PR #9841 ↗︎
|
✅ All Cypress E2E specs passed |
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.
While working on #9835 I noticed that execution cancellation is broken in queue mode - cancelling leads to an
errorstatus instead ofcanceledand does not remove the job from the queue so it goes through anyway.This PR fixes this issue, refactors cancellation out of
WaitTracker, and adds tests.https://linear.app/n8n/issue/PAY-1709