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 C552D69FC6 for ; Wed, 15 Sep 2021 15:42:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BC6E119B64 for ; Wed, 15 Sep 2021 15:42:15 +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 4004C19B59 for ; Wed, 15 Sep 2021 15:42:15 +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 16CFF4489C for ; Wed, 15 Sep 2021 15:42:15 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 15 Sep 2021 15:41:51 +0200 Message-Id: <20210915134157.19762-5-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210915134157.19762-1-f.gruenbichler@proxmox.com> References: <20210915134157.19762-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.388 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: [pve-devel] [PATCH v2 proxmox-backup 04/10] pull: use BackupGroup consistently 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: Wed, 15 Sep 2021 13:42:45 -0000 instead of `GroupListItem`s. we convert it anyway, so might as well do that at the start. Signed-off-by: Fabian Grünbichler --- src/server/pull.rs | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/server/pull.rs b/src/server/pull.rs index 5214a218..4e82df1a 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -655,28 +655,31 @@ pub async fn pull_store( } }); + let list:Vec = list + .into_iter() + .map(|item| BackupGroup::new(item.backup_type, item.backup_id)) + .collect(); + let mut errors = false; let mut new_groups = std::collections::HashSet::new(); - for item in list.iter() { - new_groups.insert(BackupGroup::new(&item.backup_type, &item.backup_id)); + for group in list.iter() { + new_groups.insert(group.clone()); } let mut progress = StoreProgress::new(list.len() as u64); - for (done, item) in list.into_iter().enumerate() { + for (done, group) in list.into_iter().enumerate() { progress.done_groups = done as u64; progress.done_snapshots = 0; progress.group_snapshots = 0; - let group = BackupGroup::new(&item.backup_type, &item.backup_id); - let (owner, _lock_guard) = match tgt_store.create_locked_backup_group(&group, &auth_id) { Ok(result) => result, Err(err) => { worker.log(format!( - "sync group {}/{} failed - group lock failed: {}", - item.backup_type, item.backup_id, err + "sync group {} failed - group lock failed: {}", + &group, err )); errors = true; // do not stop here, instead continue continue; @@ -687,8 +690,8 @@ pub async fn pull_store( if auth_id != owner { // only the owner is allowed to create additional snapshots worker.log(format!( - "sync group {}/{} failed - owner check failed ({} != {})", - item.backup_type, item.backup_id, auth_id, owner + "sync group {} failed - owner check failed ({} != {})", + &group, auth_id, owner )); errors = true; // do not stop here, instead continue } else if let Err(err) = pull_group( @@ -703,8 +706,8 @@ pub async fn pull_store( .await { worker.log(format!( - "sync group {}/{} failed - {}", - item.backup_type, item.backup_id, err, + "sync group {} failed - {}", + &group, err, )); errors = true; // do not stop here, instead continue } -- 2.30.2