tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

file restore: always wait up to 25s

Browse Source 
the timeout for connecting may be much shorter if we get a response
(which doesn't needs to be Ok, e.g., "Connection refused"), so
instead of trying a fixed amount of 60 times lets try for 25s
independent of how often that will be then.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-01-26 16:04:41 +01:00
parent d91a0f9fc9
commit 48ce3d00a4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proxmox-file-restore/src/qemu_helper.rs
View File

@ -3,7 +3,7 @@ use std::fs::{File, OpenOptions};
use std::io::prelude::*; use std::io::prelude::*;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::path::PathBuf; use std::path::PathBuf;
use std::time::Duration; use std::time::{Instant, Duration};
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Error};
use tokio::time; use tokio::time;
@ -303,7 +303,9 @@ pub async fn start_vm(
// QEMU has started successfully, now wait for virtio socket to become ready // QEMU has started successfully, now wait for virtio socket to become ready
let pid_t = Pid::from_raw(pid); let pid_t = Pid::from_raw(pid);
for _ in 0..60 {
let start_poll = Instant::now();
loop {
let client = VsockClient::new(cid as i32, DEFAULT_VSOCK_PORT, Some(ticket.to_owned())); let client = VsockClient::new(cid as i32, DEFAULT_VSOCK_PORT, Some(ticket.to_owned()));
if let Ok(Ok(_)) = if let Ok(Ok(_)) =
time::timeout(Duration::from_secs(2), client.get("api2/json/status", None)).await time::timeout(Duration::from_secs(2), client.get("api2/json/status", None)).await
@ -319,6 +321,9 @@ pub async fn start_vm(
if kill(pid_t, None).is_err() { // check if QEMU process exited in between if kill(pid_t, None).is_err() { // check if QEMU process exited in between
bail!("VM exited before connection could be established"); bail!("VM exited before connection could be established");
} }
if Instant::now().duration_since(start_poll) > Duration::from_secs(25) {
break;
}
time::sleep(Duration::from_millis(200)).await; time::sleep(Duration::from_millis(200)).await;
} }