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): Clear active execution on cancellation in scaling mode #9979

Merged

Conversation

ivov
Copy link
Contributor

@ivov ivov commented Jul 9, 2024

Summary

This PR fixes a minor issue where cancelling an execution in scaling mode was leading to the execution not being cleared from active executions, blocking main's shutdown.

To reproduce, start main and worker in queue mode, activate a cron+wait workflow, cancel the execution midway through, then send SIGINT to main. The cancelled execution lingers on in ActiveExecutions.activeExecutions so main waits for it during shutdown.

Related Linear tickets, Github issues, and Community forum posts

None, noticed while working on scaling mode.

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)

@n8n-assistant n8n-assistant bot added core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team labels Jul 9, 2024
Copy link

cypress bot commented Jul 9, 2024

3 flaky tests on run #5850 ↗︎

0 399 0 0 Flakiness 3

Details:

🌳 🖥️ browsers:node18.12.0-chrome107 🤖 ivov 🗃️ e2e/*
Project: n8n Commit: c924aa1bd3
Status: Passed Duration: 05:08 💡
Started: Jul 9, 2024 2:52 PM Ended: Jul 9, 2024 2:57 PM
Flakiness  5-ndv.cy.ts • 2 flaky tests

View Output Video

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
Flakiness  10-undo-redo.cy.ts • 1 flaky test

View Output Video

Test Artifacts
Undo/Redo > should undo/redo adding connected nodes Test Replay Screenshots Video

Review all test suite changes for PR #9979 ↗︎

Copy link
Contributor

github-actions bot commented Jul 9, 2024

✅ All Cypress E2E specs passed

@ivov ivov merged commit 7e972c7 into master Jul 9, 2024
27 checks passed
@ivov ivov deleted the clear-active-execution-on-cancellation-in-scaling-mode branch July 9, 2024 15:09
@janober
Copy link
Member

janober commented Jul 10, 2024

Got released with n8n@1.50.0

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