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 3EA7462829 for ; Wed, 30 Sep 2020 16:16:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3572F1A2FC for ; Wed, 30 Sep 2020 16:16:11 +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 C913F1A2D2 for ; Wed, 30 Sep 2020 16:16:08 +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 9264C459AD for ; Wed, 30 Sep 2020 16:16:08 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Wed, 30 Sep 2020 16:15:57 +0200 Message-Id: <20200930141601.27233-2-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200930141601.27233-1-s.reiter@proxmox.com> References: <20200930141601.27233-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.046 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] Subject: [pbs-devel] [PATCH v2 proxmox-backup 1/5] backup: don't validate chunk existance if base was recently verified 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, 30 Sep 2020 14:16:41 -0000 If the base was successfully verified within the last 7 days, we assume that it is okay and all chunks exist, so we don't have to check. Signed-off-by: Stefan Reiter --- v2: * use proxmox::tools::time src/api2/backup/environment.rs | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs index d515bf30..a8c9ddb4 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -5,7 +5,7 @@ use std::collections::HashMap; use ::serde::{Serialize}; use serde_json::{json, Value}; -use proxmox::tools::digest_to_hex; +use proxmox::tools::{digest_to_hex, time}; use proxmox::tools::fs::{replace_file, CreateOptions}; use proxmox::api::{RpcEnvironment, RpcEnvironmentType}; @@ -457,6 +457,32 @@ impl BackupEnvironment { Ok(()) } + fn last_backup_has_recent_verify(&self) -> Result { + match &self.last_backup { + Some(last_backup) => { + let last_dir = &last_backup.backup_dir; + let (manifest, _) = self.datastore.load_manifest(last_dir)?; + let verify = manifest.unprotected["verify_state"].clone(); + match serde_json::from_value::>(verify) { + Ok(verify) => match verify { + Some(verify) => { + let mut cutoff = time::TmEditor::with_epoch(time::epoch_i64(), false)?; + cutoff.add_days(-7)?; + let cutoff = cutoff.into_epoch()?; + Ok(verify.state == VerifyState::Ok && verify.upid.starttime > cutoff) + }, + None => Ok(false) + }, + Err(err) => { + self.worker.warn(format!("error parsing base verification state : '{}'", err)); + Ok(false) + } + } + }, + None => Ok(false) + } + } + /// Ensure all chunks referenced in this backup actually exist. /// Only call *after* all writers have been closed, to avoid race with GC. /// In case of error, mark the previous backup as 'verify failed'. @@ -534,7 +560,9 @@ impl BackupEnvironment { } } - self.verify_chunk_existance(&state.known_chunks)?; + if !self.last_backup_has_recent_verify()? { + self.verify_chunk_existance(&state.known_chunks)?; + } // marks the backup as successful state.finished = true; -- 2.20.1