Fix run_cvd abort on graceful guest VM shutdown - #2954
Open
SuperStrongDinosaur wants to merge 1 commit into
Open
Fix run_cvd abort on graceful guest VM shutdown#2954SuperStrongDinosaur wants to merge 1 commit into
SuperStrongDinosaur wants to merge 1 commit into
Conversation
SuperStrongDinosaur
force-pushed
the
FixCuttlefishLauncherCrashOnGracefulGuestVMShutdown
branch
from
August 3, 2026 14:57
6e4f16d to
6e4e933
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When a guest VM shuts down cleanly, crosvm exits and MonitorLoop() finishes. However, child_sock_->Shutdown() was called before setting running to false. This caused ReadMonitorSocketLoop() to treat socket closure as an error, making ProcessMonitor exit with status 1 and causing run_cvd to abort(). The leftover stale sockets caused cvd fleet to report Unreachable and cvd restart to fail with "Connection refused".
Fix this by setting running.store(false) right after MonitorLoop() finishes, so ReadMonitorSocketLoop() recognizes socket closure as intentional and returns OK.
Test: verified monitor process exits cleanly with code 0 on guest shutdown.
BUG=b/538490772
BUG=b/534717429