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 97EE868ADA for ; Thu, 22 Jul 2021 15:41:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8830A11DAE for ; Thu, 22 Jul 2021 15:41:09 +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 3DFE811DA3 for ; Thu, 22 Jul 2021 15:41:08 +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 1276F42569 for ; Thu, 22 Jul 2021 15:41:08 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 22 Jul 2021 15:41:06 +0200 Message-Id: <20210722134106.1280517-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210722134106.1280517-1-d.csapak@proxmox.com> References: <20210722134106.1280517-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.528 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: [pbs-devel] [PATCH proxmox-backup v2 7/7] 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: Thu, 22 Jul 2021 13:41:09 -0000 this should make the api call much faster, since it is not reading the whole catalog anymore Signed-off-by: Dominik Csapak --- src/api2/tape/media.rs | 44 +++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/src/api2/tape/media.rs b/src/api2/tape/media.rs index 8351b2be..cc2d896d 100644 --- a/src/api2/tape/media.rs +++ b/src/api2/tape/media.rs @@ -502,32 +502,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 MediaCatalog::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