From c1c4a18f489d486819894b2c2b7dbd1e3c7eaab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 21 Jul 2020 15:03:35 +0200 Subject: [PATCH] fix #2865: detect and skip vanished snapshots MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit also when they have been removed/forgotten since we retrieved the snapshot list for the currently syncing backup group. Signed-off-by: Fabian Grünbichler --- src/client/pull.rs | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/client/pull.rs b/src/client/pull.rs index bbe01969..421260a3 100644 --- a/src/client/pull.rs +++ b/src/client/pull.rs @@ -7,6 +7,7 @@ use std::sync::Arc; use std::collections::HashMap; use std::io::{Seek, SeekFrom}; +use proxmox::api::error::{StatusCode, HttpError}; use crate::server::{WorkerTask}; use crate::backup::*; use crate::api2::types::*; @@ -151,7 +152,28 @@ async fn pull_snapshot( let mut tmp_manifest_name = manifest_name.clone(); tmp_manifest_name.set_extension("tmp"); - let mut tmp_manifest_file = download_manifest(&reader, &tmp_manifest_name).await?; + let download_res = download_manifest(&reader, &tmp_manifest_name).await; + let mut tmp_manifest_file = match download_res { + Ok(manifest_file) => manifest_file, + Err(err) => { + match err.downcast_ref::() { + Some(HttpError { code, message }) => { + match code { + &StatusCode::NOT_FOUND => { + worker.log(format!("skipping snapshot {} - vanished since start of sync", snapshot)); + return Ok(()); + }, + _ => { + bail!("HTTP error {} - {}", code, message); + }, + } + }, + None => { + return Err(err); + }, + }; + }, + }; let tmp_manifest_blob = DataBlob::load(&mut tmp_manifest_file)?; tmp_manifest_blob.verify_crc()?;