windows: set job object for executor and children #24214
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
tgross
force-pushed
the
windows-executor-orphan
branch
from
b8faffd to
2e2a26d
Compare
On Windows, if the `raw_exec` driver's executor exits, the child processes are not also killed. Create a Windows "job object" (not to be confused with a Nomad job) and add the executor to it. Child processes of the executor will inherit the job automatically. When the handle to the job object is freed (on executor exit), the job itself is destroyed and this causes all processes in that job to exit. Fixes: #23668 Ref: https://learn.microsoft.com/en-us/windows/win32/procthread/job-objects
tgross
force-pushed
the
windows-executor-orphan
branch
from
2e2a26d to
e4bd861
Compare
|
As noted in sidebar conversation I'm going to get |
tgross
force-pushed
the
windows-executor-orphan
branch
from
08b81f4 to
c298b8b
Compare
tgross
commented
Oct 15, 2024
| @@ -237,103 +236,6 @@ func TestRawExecDriver_StartWait(t *testing.T) { | |||
| require.NoError(harness.DestroyTask(task.ID, true)) | |||
| } | |||
|
|
|||
| func TestRawExecDriver_StartWaitRecoverWaitStop(t *testing.T) { | |||
There was a problem hiding this comment.
Note to reviewers: this is moved to driver_unix_test.go unchanged, including any modernization to use shoenig/test, t.Cleanup, etc. I'll take a second pass over these files in a separate refactoring PR to do all that.
tgross
commented
Oct 15, 2024
| @@ -59,15 +59,6 @@ var ( | |||
| compute = topology.Compute() | |||
| ) | |||
|
|
|||
| type testExecCmd struct { | |||
There was a problem hiding this comment.
Note to reviewers: this whole file is marked !windows now, so I moved these helpers into utils_test.go
tgross
force-pushed
the
windows-executor-orphan
branch
from
c298b8b to
e066745
Compare
schmichael
approved these changes
Oct 15, 2024
tgross
added
backport/ent/1.7.x+ent
tgross
force-pushed
the
windows-executor-orphan
branch
from
e066745 to
a855e50
Compare
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.
On Windows, if the
raw_execdriver's executor exits, the child processes are not also killed. Create a Windows "job object" (not to be confused with a Nomad job) and add the executor to it. Child processes of the executor will inherit the job automatically. When the handle to the job object is freed (on executor exit), the job itself is destroyed and this causes all processes in that job to exit.Fixes: #23668
Ref: https://hashicorp.atlassian.net/browse/NET-11234
Ref: https://learn.microsoft.com/en-us/windows/win32/procthread/job-objects
Note: automated testing for this will need to be end-to-end but we're not running Windows on nightly anymore.I've verified the behavior works as expected using Process Explorer. Killing the executor kills all child processes as expected. Killing the root child process causes the executor to exit (as usual) and that in turn kills any child processes that didn't exit already.Edit: added tests, which requires changing what runs in CI as well