Merge branch 'eero/vsock-timeout' into 'master'

Fix timeouts around new VSOCK See merge request dfinity-lab/public/ic!15707
dfinity · Oct 31, 2023 · 2202dc0 · 2202dc0
2 parents b2553df + e5e829b
commit 2202dc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/rs/ic_os/vsock/vsock_lib/src/guest/client.rs b/rs/ic_os/vsock/vsock_lib/src/guest/client.rs
@@ -85,8 +85,9 @@ fn read_response_from_host(stream: &mut VsockStream) -> anyhow::Result<String> {
 
 fn create_stream(port: &u32) -> Result<VsockStream, std::io::Error> {
     let stream = VsockStream::connect_with_cid_port(VMADDR_CID_HOST, *port)?;
-    stream.set_write_timeout(Some(std::time::Duration::from_secs(5)))?;
-    stream.set_read_timeout(Some(std::time::Duration::from_secs(5)))?;
+    // Set a long timeout, so HostOS has enough time to upgrade.
+    stream.set_write_timeout(Some(std::time::Duration::from_secs(60 * 5)))?;
+    stream.set_read_timeout(Some(std::time::Duration::from_secs(60 * 5)))?;
 
     Ok(stream)
 }
diff --git a/rs/sys/src/utility_command.rs b/rs/sys/src/utility_command.rs
@@ -216,7 +216,7 @@ impl UtilityCommand {
                 // At this point, HostOS should reboot and take us down. The
                 // timeout on the HostOS upgrade task will catch us if we
                 // actually get stuck.
-                std::thread::sleep(std::time::Duration::from_secs(90));
+                std::thread::sleep(std::time::Duration::from_secs(60 * 10));
             }
         }