fix(core): Allow all executions to be stopped #6386
Merged
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
|
Great PR! Please pay attention to the following items before merging: Files matching
Files matching
Files matching
Make sure to check off this list before asking for review. |
Codecov ReportPatch coverage has no change and project coverage change:
Additional details and impacted files@@ Coverage Diff @@
## master #6386 +/- ##
==========================================
- Coverage 28.33% 28.26% -0.08%
==========================================
Files 2980 2980
Lines 184944 184944
Branches 20303 20300 -3
==========================================
- Hits 52401 52270 -131
- Misses 131756 131887 +131
Partials 787 787
☔ View full report in Codecov by Sentry. |
n8n-assistant
bot
added
core
krynble
suggested changes
Jun 7, 2023
| @@ -1246,7 +1246,7 @@ export class Server extends AbstractServer { | |||
| throw new ResponseHelper.NotFoundError('Execution not found'); | |||
| } | |||
|
|
|||
| const execution = await Db.collections.Execution.findOne({ | |||
| const execution = await Db.collections.Execution.exist({ | |||
There was a problem hiding this comment.
I'd suggest changing only this file.
Instead of making this change here revert the change to be findOne instead of exists.
Then, below, after the check for queue mode where we do const result = await this.activeExecutionsInstance.stopExecution(executionId); we can then have a check such as:
const result = await this.activeExecutionsInstance.stopExecution(executionId);
let returnData: IExecutionsStopData;
if (result === undefined) {
if (['running', 'new'].includes(execution.status)) {
// Do the stop procedure here as it's an execution that's not currently running but it's marked as running in DB
} else {
// If active execution could not be found check if it is a waiting one
returnData = await this.waitTracker.stopExecution(executionId);
}
} else {
returnData = {
mode: result.mode,
startedAt: new Date(result.startedAt),
stoppedAt: result.stoppedAt ? new Date(result.stoppedAt) : undefined,
finished: result.finished,
status: result.status,
};
}
krynble
approved these changes
Jun 8, 2023
Passing run #1146 ↗︎
Details:
This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. |
|||||||||||||||
|
✅ All Cypress E2E specs passed |
flipswitchingmonkey
deleted the
pay-497-change-stop-execution-to-allow-forced-stop
branch
MiloradFilipovic
added a commit
that referenced
this pull request
Jun 13, 2023
* master: test(editor): Unit test Version control frontend components (#6408) fix: Fist name to First Name in certain nodes (no-changelog) (#6404) fix(core): Allow all executions to be stopped (#6386) fix(core): RMC boolean value fix (#6397) fix(editor): Remove root level tag selector from css module to avoid making it a global style (#6392) fix(Ldap Node): Add DN field to update operation (#6371) feat: New trigger PostgreSQL (#5495) build: Update pnpm lock file (no-changelog) (#6395) fix(Date & Time Node): Reset responseData at end of loop (#6385) refactor(core): Google service account remove duplicated functions (no-changelog) (#6368) refactor(LoneScale List Node)!: Rename to LoneScale (#6337) fix(editor): Update version control setup CTA tooltip (#6393) ci: Fix build (no-changelog) (#6391) fix(editor): Add button to refresh branches (#6387) fix(editor): Add Set up version control CTA (#6356) fix(editor): Remove explicit parameter name scanning for code editors (#6390) ci: Fix build (no-changelog) (#6379) fix(editor): Adding branch color (#6380) refactor(editor): Remove user activation modal (no-changelog) (#6361) feat(editor): Change upgrade CTA on community editions (no-changelog) (#6317)
netroy
pushed a commit
that referenced
this pull request
Jun 14, 2023
* allow all executions to be stopped and fix display issue * limit cancelation and add recover for unknown states
|
Got released with |
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.
No description provided.