Reduce vm timeout
We increased the timeout during the switch to protected
(commit 16fb8555e8a8e39a7339f7a29f2e3c4aea918d7d), but partly because
of various bugs that were causing slowness. Reduce it again, but back
to 15s instead of the original 10s just to be cautious.
While I'm here, delete a now-unused timeout from the
odrefresh-in-the-host days.
Bug: 220824234
Bug: 218494522
Test: Presubmit
Change-Id: Idba2c5abae500ecc26b4ca731a32680dab58b43e
diff --git a/compos/common/timeouts.rs b/compos/common/timeouts.rs
index b3ec1e5..bdabb1e 100644
--- a/compos/common/timeouts.rs
+++ b/compos/common/timeouts.rs
@@ -26,8 +26,6 @@
pub struct Timeouts {
/// Total time that odrefresh may take to perform compilation
pub odrefresh_max_execution_time: Duration,
- /// Time allowed for a single compilation step run by odrefresh
- pub odrefresh_max_child_process_time: Duration,
/// Time allowed for the CompOS VM to start up and become ready.
pub vm_max_time_to_ready: Duration,
}
@@ -55,13 +53,11 @@
pub const NORMAL_TIMEOUTS: Timeouts = Timeouts {
// Note: the source of truth for these odrefresh timeouts is art/odrefresh/odr_config.h.
odrefresh_max_execution_time: Duration::from_secs(300),
- odrefresh_max_child_process_time: Duration::from_secs(90),
- vm_max_time_to_ready: Duration::from_secs(20),
+ vm_max_time_to_ready: Duration::from_secs(15),
};
/// The timeouts that we use when need_extra_time() returns true.
pub const EXTENDED_TIMEOUTS: Timeouts = Timeouts {
odrefresh_max_execution_time: Duration::from_secs(480),
- odrefresh_max_child_process_time: Duration::from_secs(150),
vm_max_time_to_ready: Duration::from_secs(120),
};