-
Notifications
You must be signed in to change notification settings - Fork 8.9k
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.
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): Use AbortController to notify nodes to abort execution #6141
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
00f55f3
to
7570db5
Compare
This comment was marked as outdated.
This comment was marked as outdated.
807d807
to
1fdbbe8
Compare
1fdbbe8
to
faa1077
Compare
This comment was marked as outdated.
This comment was marked as outdated.
d2b66aa
to
1e82cca
Compare
394f207
to
94f9d93
Compare
@netroy I've been seeing a lot of |
I'm guessing that this is coming from the fact that every node you pass down the I'll fix that in this PR. but, since this is just a warning, I assume that your aren't blocked by this. |
Ah, understood. No, not blocked, was just worried it might have been something more nefarious. Sounds like we're all good then. Appreciate the context. |
4c09e9e
to
1ee7c62
Compare
Signed-off-by: Oleg Ivaniv <[email protected]>
…ListenersExceededWarning
1ee7c62
to
b7dfa0d
Compare
@@ -830,11 +820,16 @@ export class WorkflowExecute { | |||
let closeFunction: Promise<void> | undefined; | |||
|
|||
return new PCancelable(async (resolve, reject, onCancel) => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
once this PR is merged, I'm going to get rid of PCancelable
and use a regular promise with AbortController
instead.
Even p-cancelable
recommends to do that since 3 years.
Moving away from PCancelable
should also make this code more readable.
packages/cli/src/databases/repositories/execution.repository.ts
Outdated
Show resolved
Hide resolved
this.abortController.abort(); | ||
const fullRunData = this.getFullRunData(startedAt); | ||
void this.executeHook('workflowExecuteAfter', [fullRunData]); | ||
setTimeout(() => resolve(fullRunData), 10); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For understanding - We are resolving this PCancelable
inside a timeout in order to allow for other promises to resolve first, i.e. to force this promise to be placed in the macrotask queue, processed after the microtask queue. Is this correct? Else why are we doing this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah. we have a bunch of async operations (that don't really take any time, and possibly don't even need to be async) that need to happen between the cancellation, and before this resolve
is called. I don't like this, and plan to fix this in the same PR where I'll remove PCancelable
completely.
|
||
onCancel.shouldReject = false; | ||
onCancel(() => { | ||
gotCancel = true; | ||
this.status = 'canceled'; | ||
this.abortController.abort(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like we can pass in a reason
arg - all cancellations that can happen right now are user-requested? Else we might want to use this arg to differentiate between user-requested cancellations vs. cancellations initiated on our end?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea. we can have cancellation from user interaction, timeout, or server shutdown.
I've created a backlog ticket: ENG-92.
runDataExecutedErrorMessage = this.$locale.baseText( | ||
'pushConnection.executionFailed.message', | ||
); | ||
} else if (runDataExecuted.status === 'canceled') { | ||
runDataExecutedErrorMessage = this.$locale.baseText( | ||
'executionsList.showMessage.stopExecution.message', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're using canceled
internally but stopped
externally - we might want to unify for consistency.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed that we should unify these. Created a ticket ENG-93
const fn = () => { | ||
abortSignal.removeEventListener('abort', fn); | ||
handler(); | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it be useful to log here that a cancellation occurred?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mean logging for every node being aborted? or do you mean we should log when an execution is aborted.
This code is called for individual node that wishes to do something on execution cancellation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Exactly, I meant for every node aborted - but on second thought, it might be enough to log when the execution itself is cancelled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for that to work, we'd have to add the log to onCancel
, while all the other execution finishing logs are in processSuccessExecution
. After PCancelable
is gone, this will be less mess, and I'll add this logging then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for explaining and addressing everything!
|
1 flaky test on run #3018 ↗︎
Details:
cypress/e2e/12-canvas.cy.ts • 1 flaky test
Review all test suite changes for PR #6141 ↗︎ |
4ef9fca
to
3e4a646
Compare
✅ All Cypress E2E specs passed |
# [1.19.0](https://github.com/n8n-io/n8n/compare/[email protected]@1.19.0) (2023-11-29) ### Bug Fixes * **core:** Ensure member and admin cannot be promoted to owner ([#7830](#7830)) ([9b87a59](9b87a59)), closes [/linear.app/n8n/issue/PAY-985/add-user-role-modification-endpoint#comment-62355f6](https://github.com//linear.app/n8n/issue/PAY-985/add-user-role-modification-endpoint/issues/comment-62355f6) * **core:** Prevent error messages due to statistics about data loading ([#7824](#7824)) ([847f6ac](847f6ac)) * **core:** Tighten checks for multi-main setup usage ([#7788](#7788)) ([fdb2c18](fdb2c18)) * **core:** Use AbortController to notify nodes to abort execution ([#6141](#6141)) ([d2c18c5](d2c18c5)) * **editor:** Add telemetry to workflow history ([#7811](#7811)) ([d497041](d497041)) * **editor:** Allow owners and admins to share workflows and credentials they don't own ([#7833](#7833)) ([3ab3ec9](3ab3ec9)) * **editor:** Disable context menu actions in read-only mode ([#7789](#7789)) ([902beff](902beff)) * **editor:** Fix cloud plan data loading on instance ([#7841](#7841)) ([8b99384](8b99384)) * **editor:** Fix credential icon for old node type version ([#7843](#7843)) ([4074107](4074107)) * **editor:** Fix icon for unknown node type ([#7842](#7842)) ([28ac5a7](28ac5a7)) * **editor:** Fix mouse position in workflow previews ([#7853](#7853)) ([c063398](c063398)) * **editor:** Show nice error when environment is not set up ([#7778](#7778)) ([5835e05](5835e05)) * **editor:** Suppress dev server websocket messages in workflow view ([#7808](#7808)) ([685ffd7](685ffd7)) * **Google Sheets Node:** Read operation execute for each item ([#7800](#7800)) ([d548872](d548872)) * **HTTP Request Node:** Enable expressions for binary input data fields ([#7782](#7782)) ([6208af0](6208af0)) * **Microsoft SQL Node:** Prevent double escaping table name ([#7801](#7801)) ([73ec753](73ec753)) ### Features * Add AI tool building capabilities ([#7336](#7336)) ([87def60](87def60)) * Add initial scope checks via decorators ([#7737](#7737)) ([a37f1cb](a37f1cb)) * Ado 1296 spike credential setup in templates ([#7786](#7786)) ([aae45b0](aae45b0)) * **core:** Add Support for custom CORS origins for webhooks ([#7455](#7455)) ([99a9ea4](99a9ea4)) * **core:** Allow user role modification ([#7797](#7797)) ([7a86d36](7a86d36)) * **core:** Set up endpoint for all existing roles with license flag ([#7834](#7834)) ([2356fb0](2356fb0)) * **editor:** Add node name and version to NDV node settings ([#7731](#7731)) ([da85198](da85198)) * **editor:** Add routing middleware, permission checks, RBAC store, RBAC component ([#7702](#7702)) ([67a8891](67a8891)) * **editor:** Replace middleware for Role checks with Scope checks ([#7847](#7847)) ([72852a6](72852a6)) * **editor:** Show avatars for users currently working on the same workflow ([#7763](#7763)) ([77bc8ec](77bc8ec)) * **Notion Node:** Option to simplify output in getChildBlocks operation ([#7791](#7791)) ([d667bca](d667bca)) * **Slack Node:** Add support for getting the profile of a user ([#7829](#7829)) ([90bb6ba](90bb6ba)) Co-authored-by: ivov <[email protected]>
) and add support for cancelling ongoing operations inside a node. --------- Co-authored-by: Oleg Ivaniv <[email protected]>
## [1.18.1](https://github.com/n8n-io/n8n/compare/[email protected]@1.18.1) (2023-11-30) ### Bug Fixes * **AWS DynamoDB Node:** Improve error message parsing ([#7793](#7793)) ([192770a](192770a)) * **core:** Prevent error messages due to statistics about data loading ([#7824](#7824)) ([c7d600a](c7d600a)) * **core:** Tighten checks for multi-main setup usage ([#7788](#7788)) ([060987a](060987a)) * **core:** Use AbortController to notify nodes to abort execution ([#6141](#6141)) ([dbad88d](dbad88d)) * **editor:** Disable context menu actions in read-only mode ([#7789](#7789)) ([ae25503](ae25503)) * **editor:** Fix cloud plan data loading on instance ([#7841](#7841)) ([b0039a3](b0039a3)) * **editor:** Fix credential icon for old node type version ([#7843](#7843)) ([9b0e2d1](9b0e2d1)) * **editor:** Fix icon for unknown node type ([#7842](#7842)) ([9cd0a75](9cd0a75)) * **editor:** Fix mouse position in workflow previews ([#7853](#7853)) ([83b5e6a](83b5e6a)) * **editor:** Suppress dev server websocket messages in workflow view ([#7808](#7808)) ([8a71178](8a71178)) * **Google Sheets Node:** Fix issue with paired items not being set correctly ([#7862](#7862)) ([95854db](95854db)) * **Google Sheets Node:** Read operation execute for each item ([#7800](#7800)) ([2563433](2563433)) * **HTTP Request Node:** Enable expressions for binary input data fields ([#7782](#7782)) ([7ec748a](7ec748a)) * **Microsoft SQL Node:** Prevent double escaping table name ([#7801](#7801)) ([6a8e7b1](6a8e7b1)) * **Notion Node:** Fix broken Notion node parameters ([#7864](#7864)) ([940944e](940944e)) Co-authored-by: netroy <[email protected]>
Got released with |
and add support for cancelling ongoing operations inside a node.