clh: isClhRunning waits for full timeout when clh exits #182
Conversation
This file contains hidden or 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
manuelh-dev
approved these changes
Apr 23, 2024
danmihai1
approved these changes
Apr 23, 2024
Redent0r
force-pushed
the
saulparedes/wait_for_clh
branch
from
c48e1bc to
b8983ba
Compare
The PID needs to be initialized before calling isClhRunning. waitVMM() uses isClhRunning and is called by launchClh() just before returning from function. Fixes: kata-containers#9230 Signed-off-by: Alexandru Matei <[email protected]>
isClhRunning uses signal 0 to test whether the process is still alive or not. This doesn't work because the process is a direct child of the shim. Once it is dead the process becomes zombie. Since no one waits for it the process lingers until its parent dies and init reaps it. Hence sending signal 0 in isClhRunning will always return success whether the process is dead or not. This patch calls wait to reap the process, if it succeeds that means it is our child process, if not we send the signal. Fixes: kata-containers#9431 Signed-off-by: Alexandru Matei <[email protected]>
Redent0r
force-pushed
the
saulparedes/wait_for_clh
branch
from
b8983ba to
5e0ec90
Compare
Signed-off-by: Saul Paredes <[email protected]>
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.
Merge Checklist
upstream-missinglabel (orupstream-not-needed) has been set on the PR.Summary
Cherry picked from upstream kata-containers@5492316
isClhRunning uses signal 0 to test whether the process is still alive or not. This doesn't work because the process is a direct child of the shim. Once it is dead the process becomes zombie.
Since no one waits for it the process lingers until its parent dies and init reaps it. Hence sending signal 0 in isClhRunning will always return success whether the process is dead or not.
This patch calls wait to reap the process, if it succeeds that means it is our child process, if not we send the signal.
Fixes: kata-containers#9431
Test Methodology
https://dev.azure.com/mariner-org/mariner/_build/results?buildId=557064&view=results