Shut down CompOS VM after compilation completes
Add a method to CompOsInstance to consume the instance and shut it
down cleanly, allowing logs to be written. Call this when compilation
ends, before calling back to our client (since they might then drop
their reference to us, which could tear everything down prematurely).
I also created a method to combind the calls to quit() and
wait_for_shutdown() to reduce duplication.
I also increased the shutdown timeout, since my initial value doesn't
seem to be enough for CompOS (see b/236588647#comment38).
Bug: 236581575
Test: composd_cmd test-compile, observe logs
Change-Id: I34a227db0e377cb9aded57461379e17d0574ea0c
diff --git a/compos/verify/verify.rs b/compos/verify/verify.rs
index e6848c7..224cde7 100644
--- a/compos/verify/verify.rs
+++ b/compos/verify/verify.rs
@@ -110,9 +110,7 @@
let service = vm_instance.connect_service()?;
let public_key = service.getPublicKey().context("Getting public key");
- // Shut down the VM cleanly, giving time for any relevant logs to be written
- let _ = service.quit(); // If this fails, the VM is probably dying anyway
- vm_instance.wait_for_shutdown();
+ vm_instance.shutdown(service);
if !compos_verify_native::verify(&public_key?, &signature, &info) {
bail!("Signature verification failed");