Backport of Fix task leak during client restore when allocrunner prerun hook fails into release/1.3.x #17119
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
hc-github-team-nomad-core
force-pushed
the
backport/b-restore-prerun-error-task-leak/notably-verified-beetle
branch
2 times, most recently
from
88eb3c2
to
53670de
Compare
|
|
plus MinJob and MinAlloc mocks in nomad/mock/ * they're separated into job.go and alloc.go, like 1.4.x, but other job/alloc mocks remain in mock.go
gulducat
force-pushed
the
backport/b-restore-prerun-error-task-leak/notably-verified-beetle
branch
from
f59a5a6
to
6cab602
Compare
gulducat
approved these changes
May 10, 2023
gulducat
deleted the
backport/b-restore-prerun-error-task-leak/notably-verified-beetle
branch
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.
Backport
This PR is auto-generated from #17104 to be assessed for backporting due to the inclusion of the label backport/1.3.x.
WARNING automatic cherry-pick of commits failed. Commits will require human attention.
The below text is copied from the body of the original PR.
Fixes #17102 -- I describe the issue more fully there.
My approach here is to stop skipping over
allocRunner.runTasks()on prerun error. That way, instead of duplicating more cleanup code, which may change in the future, the sameTaskRunner.Run()code that usually handles task cleanup can do what it needs to as appropriate with tasks that fail prerun during the alloc restore process.In pursuit of that, I made an error-inducing
FailHookand added the ability to include it as part of client Config for the client integration test. I could remove the non-Prerun interface implementations, but I figured while I'm at it, may as well make a thing that can be induced to fail at any stage in case it's useful?