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 A54F56027B for ; Wed, 14 Oct 2020 14:16:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A0FB09B25 for ; Wed, 14 Oct 2020 14:16:49 +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 5975A9ABA for ; Wed, 14 Oct 2020 14:16:47 +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 23E5045D47 for ; Wed, 14 Oct 2020 14:16:47 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Wed, 14 Oct 2020 14:16:33 +0200 Message-Id: <20201014121639.25276-6-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201014121639.25276-1-s.reiter@proxmox.com> References: <20201014121639.25276-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.038 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 proxmox-backup 05/11] verify: acquire shared snapshot flock and skip on error 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, 14 Oct 2020 12:16:49 -0000 If we can't acquire a lock (either because the snapshot disappeared, it is about to be forgotten/pruned, or it is currently still running) skip the snapshot. Hold the lock during verification, so that it cannot be deleted while we are still verifying. Signed-off-by: Stefan Reiter --- src/backup/verify.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/backup/verify.rs b/src/backup/verify.rs index f2c38eae..5e1391d9 100644 --- a/src/backup/verify.rs +++ b/src/backup/verify.rs @@ -23,6 +23,7 @@ use crate::{ task::TaskState, task_log, tools::ParallelHandler, + tools::fs::lock_dir_noblock_shared, }; fn verify_blob(datastore: Arc, backup_dir: &BackupDir, info: &FileInfo) -> Result<(), Error> { @@ -284,6 +285,21 @@ pub fn verify_backup_dir( upid: UPID, ) -> Result { + let _guard_res = 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(), + backup_dir, + err, + ); + return Ok(true); + } + let mut manifest = match datastore.load_manifest(&backup_dir) { Ok((manifest, _)) => manifest, Err(err) => { -- 2.20.1