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 8914D6111D for ; Tue, 20 Oct 2020 10:09:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7D12DB623 for ; Tue, 20 Oct 2020 10:08:38 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C20F9B601 for ; Tue, 20 Oct 2020 10:08:37 +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 8F9BB45E3A for ; Tue, 20 Oct 2020 10:08:37 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Tue, 20 Oct 2020 10:08:24 +0200 Message-Id: <20201020080825.8451-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.034 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. [verify.rs] Subject: [pbs-devel] [PATCH v2 proxmox-backup 1/2] add verify_backup_dir_with_lock for callers already holding locks 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, 20 Oct 2020 08:09:08 -0000 Signed-off-by: Stefan Reiter --- src/backup/verify.rs | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/src/backup/verify.rs b/src/backup/verify.rs index ea3fa760..2103da40 100644 --- a/src/backup/verify.rs +++ b/src/backup/verify.rs @@ -2,6 +2,7 @@ use std::collections::HashSet; use std::sync::{Arc, Mutex}; use std::sync::atomic::{Ordering, AtomicUsize}; use std::time::Instant; +use nix::dir::Dir; use anyhow::{bail, format_err, Error}; @@ -284,22 +285,43 @@ pub fn verify_backup_dir( worker: Arc, upid: UPID, ) -> Result { - - let _guard_res = lock_dir_noblock_shared( + let snap_lock = lock_dir_noblock_shared( &datastore.snapshot_path(&backup_dir), "snapshot", "locked by another operation"); - if let Err(err) = _guard_res { - task_log!( - worker, - "SKIPPED: verify {}:{} - could not acquire snapshot lock: {}", - datastore.name(), + match snap_lock { + Ok(snap_lock) => verify_backup_dir_with_lock( + datastore, backup_dir, - err, - ); - return Ok(true); + verified_chunks, + corrupt_chunks, + worker, + upid, + snap_lock + ), + Err(err) => { + task_log!( + worker, + "SKIPPED: verify {}:{} - could not acquire snapshot lock: {}", + datastore.name(), + backup_dir, + err, + ); + Ok(true) + } } +} +/// See verify_backup_dir +pub fn verify_backup_dir_with_lock( + datastore: Arc, + backup_dir: &BackupDir, + verified_chunks: Arc>>, + corrupt_chunks: Arc>>, + worker: Arc, + upid: UPID, + _snap_lock: Dir, +) -> Result { let manifest = match datastore.load_manifest(&backup_dir) { Ok((manifest, _)) => manifest, Err(err) => { -- 2.20.1