vmm: http: graceful shutdown of the http api thread #6248
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
alex-matei
force-pushed
the
fix/http-graceful-shutdown
branch
from
20e8a0b
to
98e8753
Compare
|
@alex-matei the CI configuration has changed so please rebase your work on the "main" branch |
alex-matei
force-pushed
the
fix/http-graceful-shutdown
branch
from
98e8753
to
6f904f5
Compare
|
@rbradford Done, rebased on top of main. |
rbradford
reviewed
Feb 29, 2024
vmm/src/lib.rs
Outdated
| @@ -455,25 +456,27 @@ pub fn start_vmm_thread( | |||
| None => None, | |||
| }; | |||
|
|
|||
| if let Some(http_path) = http_path { | |||
| api::start_http_path_thread( | |||
| let http_thread = if let Some(http_path) = http_path { | |||
There was a problem hiding this comment.
nit: I would have named this http_api_thread_handle so you don't need to alias it when you pass it to the function below.
There was a problem hiding this comment.
Fixed, I changed to http_api_handle.
vmm/src/api/http/mod.rs
Outdated
| // Retrieve seccomp filter for API thread | ||
| let api_seccomp_filter = get_seccomp_filter(seccomp_action, Thread::HttpApi, hypervisor_type) | ||
| .map_err(VmmError::CreateSeccompFilter)?; | ||
|
|
||
| thread::Builder::new() | ||
| let api_shutdown_fd = EventFd::new(libc::EFD_NONBLOCK).map_err(VmmError::EventFdCreate)?; | ||
|
|
There was a problem hiding this comment.
nit: Drop this line of whitespace
This commit ensures that the HttpApi thread flushes all the responses before the application shuts down. Without this step, in case of a VmmShutdown request the application might terminate before the thread sends a response. Fixes: cloud-hypervisor#6247 Signed-off-by: Alexandru Matei <alexandru.matei@uipath.com>
alex-matei
force-pushed
the
fix/http-graceful-shutdown
branch
from
6f904f5
to
70eb129
Compare
rbradford
approved these changes
Feb 29, 2024
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.
This commit ensures that the HttpApi thread flushes all the responses before the application shuts down. Without this step, in case of a VmmShutdown request the application might terminate before the thread sends a response.
Fixes: #6247