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 D161865BD2 for ; Fri, 24 Jul 2020 11:54:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C339A9760 for ; Fri, 24 Jul 2020 11:53:45 +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 079439756 for ; Fri, 24 Jul 2020 11:53:45 +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 C93C94329A for ; Fri, 24 Jul 2020 11:53:44 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 24 Jul 2020 11:53:33 +0200 Message-Id: <20200724095335.2869192-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724095335.2869192-1-f.gruenbichler@proxmox.com> References: <20200724095335.2869192-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 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. [backup.rs, commands.rs] Subject: [pve-devel] [PATCH proxmox-backup-qemu v2 1/3] refactor incremental checks X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2020 09:54:15 -0000 in preparation for adding more checks to check_incremental Signed-off-by: Fabian Grünbichler --- src/backup.rs | 5 ++++- src/commands.rs | 11 +++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/backup.rs b/src/backup.rs index 717e099..dab1da0 100644 --- a/src/backup.rs +++ b/src/backup.rs @@ -202,7 +202,10 @@ impl BackupTask { device_name: String, size: u64, ) -> bool { - check_last_incremental_csum(self.last_manifest(), device_name, size) + match self.last_manifest() { + Some(ref manifest) => check_last_incremental_csum(manifest.clone(), &device_name, size), + None => false, + } } pub async fn register_image( diff --git a/src/commands.rs b/src/commands.rs index 6f26324..dd00ca9 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -79,19 +79,14 @@ pub(crate) async fn add_config( } pub(crate) fn check_last_incremental_csum( - manifest: Option>, - device_name: String, + manifest: Arc, + device_name: &str, device_size: u64, ) -> bool { - let manifest = match manifest { - Some(ref manifest) => manifest, - None => return false, - }; - let archive_name = format!("{}.img.fidx", device_name); - match PREVIOUS_CSUMS.lock().unwrap().get(&device_name) { + match PREVIOUS_CSUMS.lock().unwrap().get(device_name) { Some(csum) => manifest.verify_file(&archive_name, &csum, device_size).is_ok(), None => false, } -- 2.20.1