pa-fazil
/
android_packages_modules_Virtualization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce vm timeout 

We increased the timeout during the switch to protected
(commit 16fb8555e8), 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
This commit is contained in:
Alan Stokes 2022-03-17 16:10:48 +00:00
parent 1a54a7d0b5
commit 758f9fdbcf
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compos/common/timeouts.rs
View File

@ -26,8 +26,6 @@ use std::time::Duration;
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 fn timeouts() -> Result<&'static Timeouts> {
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),
};