Orderly VM shutdown, part 1
Rather than killing the VM when we are done with it, ask the payload
to exit, and wait for the VM to have full exited. This allows the VM
time to write logs, generated crash dumps etc if there has been a
failure.
Add a quit method to the CompOS service, so clients can request it to
exit. Add the ability to wait for a VM to have died with a timeout to
vmclient. Implement a wait for shutdown in compos_client that waits
for the VM to exit but terminates it abruptly if it doesn't do so in a
reasonable time; do the same thing if the VM fails to start.
Change compos_verify to use this method to wait for the VM to have
fully exited once we are done with it.
Assorted refactorings:
- Simplify the timeout handling code so we panic if the neccessary
property isn't available (all requests would fail anyway). Also
updated the timeouts a little.
- Rename get_service to connect_service (it's definitely not a simple
getter).
I haven't dealt with compilation yet; that will have ramifications all
the way up to Java, and this CL is big enough already. Additionally I
haven't yet attempted to allow odsign to continue while we wait for
the VM to exit.
Bug: 236581575
Test: Run VM, see both finished & died in the logs.
Change-Id: I47501081d23833fe7ef791240161d93e38b3d951
diff --git a/compos/common/timeouts.rs b/compos/common/timeouts.rs
index d0d107f..952be0a 100644
--- a/compos/common/timeouts.rs
+++ b/compos/common/timeouts.rs
@@ -17,7 +17,7 @@
//! Timeouts for common situations, with support for longer timeouts when using nested
//! virtualization.
-use anyhow::Result;
+use lazy_static::lazy_static;
use std::time::Duration;
/// Holder for the various timeouts we use.
@@ -27,27 +27,32 @@
pub odrefresh_max_execution_time: Duration,
/// Time allowed for the CompOS VM to start up and become ready.
pub vm_max_time_to_ready: Duration,
+ /// Time we wait for a VM to exit once the payload has finished.
+ pub vm_max_time_to_exit: Duration,
}
-/// Return the timeouts that are appropriate on the current platform.
-pub fn timeouts() -> Result<&'static Timeouts> {
+lazy_static! {
+/// The timeouts that are appropriate on the current platform.
+pub static ref TIMEOUTS: Timeouts = if nested_virt::is_nested_virtualization().unwrap() {
// Nested virtualization is slow.
- if nested_virt::is_nested_virtualization()? {
- Ok(&EXTENDED_TIMEOUTS)
- } else {
- Ok(&NORMAL_TIMEOUTS)
- }
+ EXTENDED_TIMEOUTS
+} else {
+ NORMAL_TIMEOUTS
+};
}
/// The timeouts that we use normally.
const NORMAL_TIMEOUTS: Timeouts = Timeouts {
- // Note: the source of truth for these odrefresh timeouts is art/odrefresh/odr_config.h.
+ // Note: the source of truth for this odrefresh timeout is art/odrefresh/odrefresh.cc.
odrefresh_max_execution_time: Duration::from_secs(300),
vm_max_time_to_ready: Duration::from_secs(15),
+ vm_max_time_to_exit: Duration::from_secs(3),
};
-/// The timeouts that we use when need_extra_time() returns true.
+/// The timeouts that we use when running under nested virtualization.
const EXTENDED_TIMEOUTS: Timeouts = Timeouts {
+ // Note: the source of truth for this odrefresh timeout is art/odrefresh/odrefresh.cc.
odrefresh_max_execution_time: Duration::from_secs(480),
vm_max_time_to_ready: Duration::from_secs(120),
+ vm_max_time_to_exit: Duration::from_secs(10),
};