From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1B05D67043 for ; Wed, 29 Jul 2020 14:33:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AB96AE9E5 for ; Wed, 29 Jul 2020 14:33:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BA43DE99E for ; Wed, 29 Jul 2020 14:33:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8140B433E4 for ; Wed, 29 Jul 2020 14:33:21 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Wed, 29 Jul 2020 14:33:14 +0200 Message-Id: <20200729123314.10049-6-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200729123314.10049-1-s.reiter@proxmox.com> References: <20200729123314.10049-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.042 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [environment.rs, backup.rs] Subject: [pbs-devel] [PATCH proxmox-backup 5/5] backup: ensure base snapshots are still available after backup X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jul 2020 12:33:24 -0000 This should never trigger if everything else works correctly, but it is still a very cheap check to avoid wrongly marking a backup as "OK" when in fact some chunks might be missing. Signed-off-by: Stefan Reiter --- src/api2/backup.rs | 1 + src/api2/backup/environment.rs | 21 ++++++++++++++++++++- src/backup/backup_info.rs | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/api2/backup.rs b/src/api2/backup.rs index 621e8c07..b9dff1fc 100644 --- a/src/api2/backup.rs +++ b/src/api2/backup.rs @@ -660,6 +660,7 @@ fn download_previous( }; if let Some(index) = index { env.log(format!("register chunks in '{}' from previous backup.", archive_name)); + env.register_base_snapshot(last_backup.backup_dir.clone()); for pos in 0..index.index_count() { let info = index.chunk_info(pos).unwrap(); diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs index f2ebd24f..c8417ef9 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -1,6 +1,6 @@ use anyhow::{bail, Error}; use std::sync::{Arc, Mutex}; -use std::collections::HashMap; +use std::collections::{HashMap, HashSet}; use serde_json::{json, Value}; @@ -57,6 +57,7 @@ struct SharedBackupState { dynamic_writers: HashMap, fixed_writers: HashMap, known_chunks: HashMap<[u8;32], u32>, + base_snapshots: HashSet, } impl SharedBackupState { @@ -108,6 +109,7 @@ impl BackupEnvironment { dynamic_writers: HashMap::new(), fixed_writers: HashMap::new(), known_chunks: HashMap::new(), + base_snapshots: HashSet::new(), }; Self { @@ -124,6 +126,13 @@ impl BackupEnvironment { } } + /// Register a snapshot as a predecessor of the current backup. + /// It's existance will be ensured on finishing. + pub fn register_base_snapshot(&self, snap: BackupDir) { + let mut state = self.state.lock().unwrap(); + state.base_snapshots.insert(snap); + } + /// Register a Chunk with associated length. /// /// We do not fully trust clients, so a client may only use registered @@ -445,6 +454,16 @@ impl BackupEnvironment { bail!("backup does not contain valid files (file count == 0)"); } + for snap in &state.base_snapshots { + let path = self.datastore.snapshot_path(snap); + if !path.exists() { + bail!( + "base snapshot {} was removed during backup, cannot finish as chunks might be missing", + snap + ); + } + } + state.finished = true; Ok(()) diff --git a/src/backup/backup_info.rs b/src/backup/backup_info.rs index 041f5785..e77cc787 100644 --- a/src/backup/backup_info.rs +++ b/src/backup/backup_info.rs @@ -217,7 +217,7 @@ impl std::str::FromStr for BackupGroup { /// Uniquely identify a Backup (relative to data store) /// /// We also call this a backup snaphost. -#[derive(Debug, Eq, PartialEq, Clone)] +#[derive(Debug, Eq, PartialEq, Hash, Clone)] pub struct BackupDir { /// Backup group group: BackupGroup, -- 2.20.1