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 72F6869ADA for ; Wed, 28 Jul 2021 11:11:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6559822215 for ; Wed, 28 Jul 2021 11:11:25 +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 5A46A221F2 for ; Wed, 28 Jul 2021 11:11:23 +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 21CDE42B9F; Wed, 28 Jul 2021 11:11:23 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Wed, 28 Jul 2021 11:11:18 +0200 Message-Id: <20210728091118.581161-5-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210728091118.581161-1-dietmar@proxmox.com> References: <20210728091118.581161-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.772 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. [media.rs] Subject: [pbs-devel] [PATCH proxmox-backup v3 4/4] api2: tape: media: use MediaCatalog::snapshot_list for content listing 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, 28 Jul 2021 09:11:25 -0000 From: Dominik Csapak this should make the api call much faster, since it is not reading the whole catalog anymore Signed-off-by: Dominik Csapak Signed-off-by: Dietmar Maurer --- src/api2/tape/media.rs | 45 ++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/src/api2/tape/media.rs b/src/api2/tape/media.rs index 8351b2be..f8e1699d 100644 --- a/src/api2/tape/media.rs +++ b/src/api2/tape/media.rs @@ -42,6 +42,7 @@ use crate::{ Inventory, MediaPool, MediaCatalog, + media_catalog_snapshot_list, changer::update_online_status, }, }; @@ -502,32 +503,28 @@ pub fn list_content( .generate_media_set_name(&set.uuid, template) .unwrap_or_else(|_| set.uuid.to_string()); - let catalog = MediaCatalog::open(status_path, &media_id, false, false)?; + for (store, snapshot) in media_catalog_snapshot_list(status_path, &media_id)? { + let backup_dir: BackupDir = snapshot.parse()?; - for (store, content) in catalog.content() { - for snapshot in content.snapshot_index.keys() { - let backup_dir: BackupDir = snapshot.parse()?; - - if let Some(ref backup_type) = filter.backup_type { - if backup_dir.group().backup_type() != backup_type { continue; } - } - if let Some(ref backup_id) = filter.backup_id { - if backup_dir.group().backup_id() != backup_id { continue; } - } - - list.push(MediaContentEntry { - uuid: media_id.label.uuid.clone(), - label_text: media_id.label.label_text.to_string(), - pool: set.pool.clone(), - media_set_name: media_set_name.clone(), - media_set_uuid: set.uuid.clone(), - media_set_ctime: set.ctime, - seq_nr: set.seq_nr, - snapshot: snapshot.to_owned(), - store: store.to_owned(), - backup_time: backup_dir.backup_time(), - }); + if let Some(ref backup_type) = filter.backup_type { + if backup_dir.group().backup_type() != backup_type { continue; } + } + if let Some(ref backup_id) = filter.backup_id { + if backup_dir.group().backup_id() != backup_id { continue; } } + + list.push(MediaContentEntry { + uuid: media_id.label.uuid.clone(), + label_text: media_id.label.label_text.to_string(), + pool: set.pool.clone(), + media_set_name: media_set_name.clone(), + media_set_uuid: set.uuid.clone(), + media_set_ctime: set.ctime, + seq_nr: set.seq_nr, + snapshot: snapshot.to_owned(), + store: store.to_owned(), + backup_time: backup_dir.backup_time(), + }); } } -- 2.30.2