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 DDC2161A29 for ; Mon, 30 Nov 2020 16:28:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D3E2F18015 for ; Mon, 30 Nov 2020 16:27:37 +0100 (CET) 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 AB85418009 for ; Mon, 30 Nov 2020 16:27:36 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7750E446BC for ; Mon, 30 Nov 2020 16:27:36 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 30 Nov 2020 16:27:18 +0100 Message-Id: <20201130152721.666511-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201130152721.666511-1-f.gruenbichler@proxmox.com> References: <20201130152721.666511-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.024 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 Subject: [pbs-devel] [PATCH proxmox-backup 1/4] remove BackupGroup::list_groups 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: Mon, 30 Nov 2020 15:28:07 -0000 BackupInfo::list_backup_groups is identical code-wise, and makes more sense as entry point for listing groups. Signed-off-by: Fabian Grünbichler --- Notes: we could of course remove the other one, or move this to datastore.rs altogether? src/backup/backup_info.rs | 14 -------------- src/backup/verify.rs | 2 +- src/client/pull.rs | 2 +- src/server/prune_job.rs | 4 ++-- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/backup/backup_info.rs b/src/backup/backup_info.rs index 367cb8ee..5ff1a6f8 100644 --- a/src/backup/backup_info.rs +++ b/src/backup/backup_info.rs @@ -145,20 +145,6 @@ impl BackupGroup { Ok(last) } - - pub fn list_groups(base_path: &Path) -> Result, Error> { - let mut list = Vec::new(); - - tools::scandir(libc::AT_FDCWD, base_path, &BACKUP_TYPE_REGEX, |l0_fd, backup_type, file_type| { - if file_type != nix::dir::Type::Directory { return Ok(()); } - tools::scandir(l0_fd, backup_type, &BACKUP_ID_REGEX, |_l1_fd, backup_id, file_type| { - if file_type != nix::dir::Type::Directory { return Ok(()); } - list.push(BackupGroup::new(backup_type, backup_id)); - Ok(()) - }) - })?; - Ok(list) - } } impl std::fmt::Display for BackupGroup { diff --git a/src/backup/verify.rs b/src/backup/verify.rs index 1eccdd67..21a31a3f 100644 --- a/src/backup/verify.rs +++ b/src/backup/verify.rs @@ -533,7 +533,7 @@ pub fn verify_all_backups( } }; - let mut list = match BackupGroup::list_groups(&datastore.base_path()) { + let mut list = match BackupInfo::list_backup_groups(&datastore.base_path()) { Ok(list) => list .into_iter() .filter(|group| !(group.backup_type() == "host" && group.backup_id() == "benchmark")) diff --git a/src/client/pull.rs b/src/client/pull.rs index 7d55f9fa..0c9afe0a 100644 --- a/src/client/pull.rs +++ b/src/client/pull.rs @@ -565,7 +565,7 @@ pub async fn pull_store( if delete { let result: Result<(), Error> = proxmox::try_block!({ - let local_groups = BackupGroup::list_groups(&tgt_store.base_path())?; + let local_groups = BackupInfo::list_backup_groups(&tgt_store.base_path())?; for local_group in local_groups { if new_groups.contains(&local_group) { continue; } worker.log(format!("delete vanished group '{}/{}'", local_group.backup_type(), local_group.backup_id())); diff --git a/src/server/prune_job.rs b/src/server/prune_job.rs index 67d438d9..572f1b04 100644 --- a/src/server/prune_job.rs +++ b/src/server/prune_job.rs @@ -4,7 +4,7 @@ use proxmox::try_block; use crate::{ api2::types::*, - backup::{compute_prune_info, BackupGroup, DataStore, PruneOptions}, + backup::{compute_prune_info, BackupInfo, DataStore, PruneOptions}, server::jobstate::Job, server::WorkerTask, task_log, @@ -43,7 +43,7 @@ pub fn do_prune_job( let base_path = datastore.base_path(); - let groups = BackupGroup::list_groups(&base_path)?; + let groups = BackupInfo::list_backup_groups(&base_path)?; for group in groups { let list = group.list_backups(&base_path)?; let mut prune_info = compute_prune_info(list, &prune_options)?; -- 2.20.1