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.

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): Fix resuming executions on test webhooks from Wait nodes #13168

Merged
merged 2 commits into from
Feb 10, 2025

Conversation

ivov
Copy link
Contributor

@ivov ivov commented Feb 10, 2025

Summary

On master, in scaling mode, on both single- or multi-main, if you put an execution to wait for a webhook call and then call the webhook to resume the execution, the worker runs the execution from the start instead of resuming from the wait node. This PR ensures that workers resume the execution instead of restarting it.

To reproduce, import this workflow https://n8n.to/cat-604 and run it and call curl -X POST http://localhost:5678/webhook-waiting/{n} (find the n from the Wait node on the UI). Before this fix, worker logs show all nodes being executed; after this fix, worker logs show only the Wait node being executed. Tested with OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS enabled and disabled, and in both single- and multi-main mode.

Note there is a related but out of scope issue affecting push messages on resuming.

Related Linear tickets, Github issues, and Community forum posts

https://linear.app/n8n/issue/CAT-604

Review / Merge checklist

  • PR title and summary are descriptive. (conventions)
  • Docs updated or follow-up ticket created.
  • Tests included.
  • PR Labeled with release/backport (if the PR is an urgent fix that needs to be backported)

Copy link

codecov bot commented Feb 10, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

📢 Thoughts on this report? Let us know!

@n8n-assistant n8n-assistant bot added core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team labels Feb 10, 2025
@ivov ivov marked this pull request as ready for review February 10, 2025 14:37
tomi
tomi previously approved these changes Feb 10, 2025
Copy link
Collaborator

@tomi tomi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works nicely 👏 🚀

@@ -121,6 +121,8 @@ export class WaitingWebhooks implements IWebhookManager {

const lastNodeExecuted = execution.data.resultData.lastNodeExecuted as string;

if (execution.mode === 'manual') execution.data.isTestWebhook = true;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could add a comment here why we are setting this for future reference

Copy link

cypress bot commented Feb 10, 2025

n8n    Run #9213

Run Properties:  status check passed Passed #9213  •  git commit 46a149a03e: 🌳 🖥️ browsers:node18.12.0-chrome107 🤖 ivov 🗃️ e2e/*
Project n8n
Branch Review cat-604
Run status status check passed Passed #9213
Run duration 04m 41s
Commit git commit 46a149a03e: 🌳 🖥️ browsers:node18.12.0-chrome107 🤖 ivov 🗃️ e2e/*
Committer Iván Ovejero
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 1
Tests that did not run due to a developer annotating a test with .skip  Pending 5
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 435
View all changes introduced in this branch ↗︎

Copy link
Contributor

✅ All Cypress E2E specs passed

Copy link
Contributor

⚠️ Some Cypress E2E specs are failing, please fix them before merging

Copy link
Contributor

✅ All Cypress E2E specs passed

@ivov ivov merged commit 5dddf77 into master Feb 10, 2025
38 checks passed
@ivov ivov deleted the cat-604 branch February 10, 2025 15:43
@github-actions github-actions bot mentioned this pull request Feb 13, 2025
@janober
Copy link
Member

janober commented Feb 13, 2025

Got released with [email protected]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team Released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants