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 651AE798DC for ; Wed, 27 Oct 2021 13:23:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CC57811EAC for ; Wed, 27 Oct 2021 13:22:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 52F2F11E6E for ; Wed, 27 Oct 2021 13:22:40 +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 1B12D45FD1 for ; Wed, 27 Oct 2021 13:22:40 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 27 Oct 2021 13:22:31 +0200 Message-Id: <20211027112238.3758515-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211027112238.3758515-1-d.csapak@proxmox.com> References: <20211027112238.3758515-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.268 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [pull.rs] Subject: [pbs-devel] [PATCH proxmox-backup v3 06/13] pull_store/group: dont try remove locally protected snapshots 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, 27 Oct 2021 11:23:08 -0000 and log if a vanished groups could not be completely deleted if it contains protected snapshots Signed-off-by: Dominik Csapak --- src/server/pull.rs | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/server/pull.rs b/src/server/pull.rs index a15d3bb5..555f0a94 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -605,6 +605,14 @@ pub async fn pull_group( if remote_snapshots.contains(&backup_time) { continue; } + if info.backup_dir.is_protected(tgt_store.base_path()) { + task_log!( + worker, + "don't delete vanished snapshot {:?} (protected)", + info.backup_dir.relative_path() + ); + continue; + } task_log!(worker, "delete vanished snapshot {:?}", info.backup_dir.relative_path()); tgt_store.remove_backup_dir(&info.backup_dir, false)?; } @@ -719,9 +727,15 @@ pub async fn pull_store( local_group.backup_type(), local_group.backup_id() ); - if let Err(err) = tgt_store.remove_backup_group(&local_group) { - task_log!(worker, "{}", err.to_string()); - errors = true; + match tgt_store.remove_backup_group(&local_group) { + Ok(true) => {}, + Ok(false) => { + task_log!(worker, "kept some protected snapshots of group '{}'", local_group); + }, + Err(err) => { + task_log!(worker, "{}", err); + errors = true; + } } } Ok(()) -- 2.30.2