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 F215F6A03C for ; Tue, 11 Aug 2020 10:51:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 673CC1B211 for ; Tue, 11 Aug 2020 10:51:02 +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 F114B1B1BC for ; Tue, 11 Aug 2020 10:50:58 +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 B4478445AA for ; Tue, 11 Aug 2020 10:50:58 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Tue, 11 Aug 2020 10:50:40 +0200 Message-Id: <20200811085042.30686-6-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200811085042.30686-1-s.reiter@proxmox.com> References: <20200811085042.30686-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.068 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 v2 proxmox-backup 5/7] Revert "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: Tue, 11 Aug 2020 08:51:33 -0000 This reverts commit d53fbe24741ed3bd920ee1c61bc163b1874b7c82. The HashSet and "register" function are unnecessary, as we already know which backup is the one we need to check: the last one, stored as 'last_backup'. Signed-off-by: Stefan Reiter --- The next patch restores this functionality in a much simpler way. src/api2/backup.rs | 1 - src/api2/backup/environment.rs | 21 +-------------------- src/backup/backup_info.rs | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/api2/backup.rs b/src/api2/backup.rs index f541eb97..eda83bb3 100644 --- a/src/api2/backup.rs +++ b/src/api2/backup.rs @@ -661,7 +661,6 @@ 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 f8c3f651..e4d280a4 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -1,6 +1,6 @@ use anyhow::{bail, format_err, Error}; use std::sync::{Arc, Mutex}; -use std::collections::{HashMap, HashSet}; +use std::collections::HashMap; use ::serde::{Serialize}; use serde_json::{json, Value}; @@ -73,7 +73,6 @@ struct SharedBackupState { dynamic_writers: HashMap, fixed_writers: HashMap, known_chunks: HashMap<[u8;32], u32>, - base_snapshots: HashSet, backup_size: u64, // sums up size of all files backup_stat: UploadStatistic, } @@ -127,7 +126,6 @@ impl BackupEnvironment { dynamic_writers: HashMap::new(), fixed_writers: HashMap::new(), known_chunks: HashMap::new(), - base_snapshots: HashSet::new(), backup_size: 0, backup_stat: UploadStatistic::new(), }; @@ -146,13 +144,6 @@ 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 @@ -489,16 +480,6 @@ impl BackupEnvironment { self.datastore.store_manifest(&self.backup_dir, manifest) .map_err(|err| format_err!("unable to store manifest blob - {}", err))?; - 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 - ); - } - } - // marks the backup as successful state.finished = true; diff --git a/src/backup/backup_info.rs b/src/backup/backup_info.rs index 26b57fae..1d42d79d 100644 --- a/src/backup/backup_info.rs +++ b/src/backup/backup_info.rs @@ -173,7 +173,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, Hash, Clone)] +#[derive(Debug, Eq, PartialEq, Clone)] pub struct BackupDir { /// Backup group group: BackupGroup, -- 2.20.1