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 E0CDA6A436 for ; Thu, 16 Sep 2021 12:08:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D909E23B45 for ; Thu, 16 Sep 2021 12:08:31 +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 1F34E23B3A for ; Thu, 16 Sep 2021 12:08:31 +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 E5CB3448DC for ; Thu, 16 Sep 2021 12:08:30 +0200 (CEST) Date: Thu, 16 Sep 2021 12:08:23 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20210906105755.2651203-1-d.csapak@proxmox.com> <20210906105755.2651203-7-d.csapak@proxmox.com> In-Reply-To: <20210906105755.2651203-7-d.csapak@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1631786747.rvgvxii2pi.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.364 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 Subject: Re: [pbs-devel] [PATCH proxmox-backup 06/12] 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: Thu, 16 Sep 2021 10:08:31 -0000 On September 6, 2021 12:57 pm, Dominik Csapak wrote: > and log if a vanished groups could not be completely deleted if it > contains protected snapshots I am not yet 100% if not syncing protected is the right way to go, it's=20 messy and potentially a pitfall either way.. should be properly=20 documented in any case, and maybe syncing a protected snapshot could=20 indicate that the protection flag was not carried over? >=20 > Signed-off-by: Dominik Csapak > --- > src/server/pull.rs | 19 ++++++++++++++++--- > 1 file changed, 16 insertions(+), 3 deletions(-) >=20 > diff --git a/src/server/pull.rs b/src/server/pull.rs > index 5214a218..910ba03b 100644 > --- a/src/server/pull.rs > +++ b/src/server/pull.rs > @@ -609,6 +609,13 @@ pub async fn pull_group( > if remote_snapshots.contains(&backup_time) { > continue; > } > + if info.backup_dir.is_protected(tgt_store.base_path()) { > + worker.log(format!( > + "don't delete vanished snapshot {:?} (protected)= ", > + info.backup_dir.relative_path() > + )); > + continue; > + } > worker.log(format!( > "delete vanished snapshot {:?}", > info.backup_dir.relative_path() > @@ -722,9 +729,15 @@ pub async fn pull_store( > local_group.backup_type(), > local_group.backup_id() > )); > - if let Err(err) =3D tgt_store.remove_backup_group(&local= _group) { > - worker.log(err.to_string()); > - errors =3D true; > + match tgt_store.remove_backup_group(&local_group) { > + Ok(true) =3D> {}, > + Ok(false) =3D> { > + task_log!(worker, "kept some protected snapshots= of group '{}'", local_group); > + }, > + Err(err) =3D> { > + task_log!(worker, "{}", err); > + errors =3D true; > + } > } > } > Ok(()) > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20