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): Prevent executions from becoming forever running #7569

Merged
merged 1 commit into from Nov 1, 2023

Conversation

netroy
Copy link
Member

@netroy netroy commented Nov 1, 2023

Fixes CP-867
Possibly also fixes PAY-323 and PAY-412

Copy link
Contributor

github-actions bot commented Nov 1, 2023

Great PR! Please pay attention to the following items before merging:

Files matching packages/**:

  • If fixing bug, added test to cover scenario.
  • If addressing forum or Github issue, added link to description.

Files matching packages/**/*.ts:

  • Added unit tests to cover new or updated functionality.

Make sure to check off this list before asking for review.

@n8n-assistant n8n-assistant bot added core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team labels Nov 1, 2023
@netroy netroy marked this pull request as draft November 1, 2023 10:41
@netroy netroy force-pushed the fix-forever-running-executions-CP-867 branch from 297d67f to 81ee37b Compare November 1, 2023 11:20
@netroy netroy marked this pull request as ready for review November 1, 2023 11:21

try {
this.logger.verbose(
Copy link
Member Author

Choose a reason for hiding this comment

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

this was a duplicate of line 304

Copy link

codecov bot commented Nov 1, 2023

Codecov Report

Attention: 9 lines in your changes are missing coverage. Please review.

Comparison is base (ce14f62) 33.73% compared to head (81ee37b) 33.73%.
Report is 2 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7569      +/-   ##
==========================================
- Coverage   33.73%   33.73%   -0.01%     
==========================================
  Files        3408     3408              
  Lines      208366   208369       +3     
  Branches    22522    22517       -5     
==========================================
- Hits        70302    70294       -8     
- Misses     136912   136924      +12     
+ Partials     1152     1151       -1     
Files Coverage Δ
packages/cli/src/InternalHooks.ts 9.21% <0.00%> (-0.38%) ⬇️
packages/cli/src/WorkflowRunner.ts 13.84% <0.00%> (-0.05%) ⬇️
packages/cli/src/commands/worker.ts 26.60% <0.00%> (-0.25%) ⬇️
...src/databases/repositories/execution.repository.ts 41.75% <0.00%> (-0.44%) ⬇️

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

cypress bot commented Nov 1, 2023

2 flaky tests on run #2653 ↗︎

0 262 0 0 Flakiness 2

Details:

🌳 🖥️ browsers:node18.12.0-chrome107 🤖 netroy 🗃️ e2e/*
Project: n8n Commit: 81ee37b289
Status: Passed Duration: 09:40 💡
Started: Nov 1, 2023 12:38 PM Ended: Nov 1, 2023 12:48 PM
Flakiness  6-code-node.cy.ts • 1 flaky test

View Output Video

Test Artifacts
... > generate code button should have correct state & tooltips Output Screenshots Video
Flakiness  26-resource-locator.cy.ts • 1 flaky test

View Output Video

Test Artifacts
Resource Locator > should retrieve list options when other params throw errors Output Screenshots Video

Review all test suite changes for PR #7569 ↗︎

Copy link
Contributor

github-actions bot commented Nov 1, 2023

✅ All Cypress E2E specs passed

@netroy netroy merged commit 9bdb85c into master Nov 1, 2023
58 of 59 checks passed
@netroy netroy deleted the fix-forever-running-executions-CP-867 branch November 1, 2023 12:51
@github-actions github-actions bot mentioned this pull request Nov 2, 2023
krynble added a commit that referenced this pull request Nov 2, 2023
#
[1.15.0](https://github.com/n8n-io/n8n/compare/n8n@1.14.0...n8n@1.15.0)
(2023-11-02)


### Bug Fixes

* **core:** Ensure execution deletion in worker lifecycle hook
([#7481](#7481))
([742c8a8](742c8a8))
* **core:** Fix data encryption on credentials import
([#7560](#7560))
([b350568](b350568))
* **core:** Fix issue that prevents owner logging in when using ldap
([#7408](#7408))
([479f902](479f902))
* **core:** Handle missing resultData in runData
([#7523](#7523))
([1055bd3](1055bd3))
* **core:** Permission check for subworkflow properly checking for
workflow settings ([#7576](#7576))
([437c95e](437c95e))
* **core:** Prevent executions from becoming forever running
([#7569](#7569))
([9bdb85c](9bdb85c))
* **core:** Upgrade crypto-js to address CVE-2023-46233
([#7519](#7519))
([65e5593](65e5593))
* **editor:** Do not truncate form inputs
([#7528](#7528))
([ae616f1](ae616f1))
* **editor:** Fix NDV close after using input select
([#7544](#7544))
([3b5e181](3b5e181))
* **editor:** Fix NDV unexpected re-render
([#7532](#7532))
([2853fcf](2853fcf))
* **editor:** Fix route component caching, incorrect use of array reduce
method and enable WF history feature
([#7434](#7434))
([12a89e6](12a89e6))
* **editor:** Fixes the issue that Switch Node can not be created
([#7516](#7516))
([df89685](df89685))
* **editor:** Handle `localStorage` being blocked/unavailable
([#7348](#7348))
([c05bc67](c05bc67))
* **Jira Software Node:** Handle missing issue types in issue types
loader ([#7534](#7534))
([9762705](9762705))
* **Switch Node:** Allow sortable Switch rules
([#7555](#7555))
([7a56e58](7a56e58))


### Features

* **core:** Add optional Error-Output
([#7460](#7460))
([655efea](655efea))
* **core:** Make queue mode settings configurable
([#7526](#7526))
([3d95b24](3d95b24))
* **core:** Set up leader selection for multiple main instances
([#7527](#7527))
([442c73e](442c73e))
* **editor:** Implement the `UserStack` design system component
([#7559](#7559))
([ce14f62](ce14f62))
* **HTTP Request Node:** Add pagination support
([#5993](#5993))
([cc2bd2e](cc2bd2e))
* **HTTP Request Node:** Update icon and default color
([#7572](#7572))
([ff279ab](ff279ab))
* **n8n Form Trigger Node:** Add text area and password input types
([#7474](#7474))
([b72040a](b72040a))
* **editor:** Dark mode is here! You can change it under personal
settings.([#6980](#6980))
([0746783](0746783))

---------

Co-authored-by: krynble <krynble@users.noreply.github.com>
Co-authored-by: Omar Ajoue <krynble@gmail.com>
@github-actions github-actions bot mentioned this pull request Nov 2, 2023
krynble added a commit that referenced this pull request Nov 2, 2023
##
[1.15.1](https://github.com/n8n-io/n8n/compare/n8n@1.14.0...n8n@1.15.1)
(2023-11-02)


### Bug Fixes

* **core:** Ensure execution deletion in worker lifecycle hook
([#7481](#7481))
([742c8a8](742c8a8))
* **core:** Fix data encryption on credentials import
([#7560](#7560))
([b350568](b350568))
* **core:** Fix issue that prevents owner logging in when using ldap
([#7408](#7408))
([479f902](479f902))
* **core:** Handle missing resultData in runData
([#7523](#7523))
([1055bd3](1055bd3))
* **core:** Permission check for subworkflow properly checking for
workflow settings ([#7576](#7576))
([437c95e](437c95e))
* **core:** Prevent executions from becoming forever running
([#7569](#7569))
([9bdb85c](9bdb85c))
* **core:** Upgrade crypto-js to address CVE-2023-46233
([#7519](#7519))
([65e5593](65e5593))
* **editor:** Do not truncate form inputs
([#7528](#7528))
([ae616f1](ae616f1))
* **editor:** Fix NDV close after using input select
([#7544](#7544))
([3b5e181](3b5e181))
* **editor:** Fix NDV unexpected re-render
([#7532](#7532))
([2853fcf](2853fcf))
* **editor:** Fix route component caching, incorrect use of array reduce
method and enable WF history feature
([#7434](#7434))
([12a89e6](12a89e6))
* **editor:** Fixes the issue that Switch Node can not be created
([#7516](#7516))
([df89685](df89685))
* **editor:** Handle `localStorage` being blocked/unavailable
([#7348](#7348))
([c05bc67](c05bc67))
* Fix dark mode small issues
([#7573](#7573))
([1d81afc](1d81afc))
* **Jira Software Node:** Handle missing issue types in issue types
loader ([#7534](#7534))
([9762705](9762705))
* **Switch Node:** Allow sortable Switch rules
([#7555](#7555))
([7a56e58](7a56e58))


### Features

* **core:** Add optional Error-Output
([#7460](#7460))
([655efea](655efea))
* **core:** Make queue mode settings configurable
([#7526](#7526))
([3d95b24](3d95b24))
* **core:** Set up leader selection for multiple main instances
([#7527](#7527))
([442c73e](442c73e))
* **editor:** Implement the `UserStack` design system component
([#7559](#7559))
([ce14f62](ce14f62))
* **HTTP Request Node:** Add pagination support
([#5993](#5993))
([cc2bd2e](cc2bd2e))
* **HTTP Request Node:** Update icon and default color
([#7572](#7572))
([ff279ab](ff279ab))
* **n8n Form Trigger Node:** Add text area and password input types
([#7474](#7474))
([b72040a](b72040a))
* **editor:** Dark mode is here! You can change it under personal
settings.([#6980](#6980))
([0746783](0746783))

---------

Co-authored-by: krynble <krynble@users.noreply.github.com>
Co-authored-by: Omar Ajoue <krynble@gmail.com>
@janober
Copy link
Member

janober commented Nov 2, 2023

Got released with n8n@1.15.1

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.

None yet

3 participants