From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 0160D1FF187 for ; Mon, 25 Aug 2025 10:10:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 96CADB8AF; Mon, 25 Aug 2025 10:10:45 +0200 (CEST) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 25 Aug 2025 10:08:38 +0200 Message-ID: <20250825081042.797559-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250825081042.797559-1-d.csapak@proxmox.com> References: <20250825081042.797559-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH datacenter-manager v3 2/8] server: api: remote tasks: add 'remote' filter option X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" so we can filter the tasks by remote Signed-off-by: Dominik Csapak --- server/src/api/remote_tasks.rs | 16 ++++++++++++---- server/src/remote_tasks/mod.rs | 10 +++++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/server/src/api/remote_tasks.rs b/server/src/api/remote_tasks.rs index 05ce366..db9fadf 100644 --- a/server/src/api/remote_tasks.rs +++ b/server/src/api/remote_tasks.rs @@ -1,5 +1,6 @@ use anyhow::Error; -use pdm_api_types::{TaskFilters, TaskListItem}; + +use pdm_api_types::{remotes::REMOTE_ID_SCHEMA, TaskFilters, TaskListItem}; use proxmox_router::{list_subdirs_api_method, Permission, Router, SubdirMap}; use proxmox_schema::api; use proxmox_sortable_macro::sortable; @@ -24,13 +25,20 @@ const SUBDIRS: SubdirMap = &sorted!([("list", &Router::new().get(&API_METHOD_LIS filters: { type: TaskFilters, flatten: true, - } + }, + remote: { + schema: REMOTE_ID_SCHEMA, + optional: true, + }, }, }, )] /// Get the list of tasks for all remotes. -async fn list_tasks(filters: TaskFilters) -> Result, Error> { - let tasks = remote_tasks::get_tasks(filters).await?; +async fn list_tasks( + filters: TaskFilters, + remote: Option, +) -> Result, Error> { + let tasks = remote_tasks::get_tasks(filters, remote).await?; Ok(tasks) } diff --git a/server/src/remote_tasks/mod.rs b/server/src/remote_tasks/mod.rs index 91b79c1..b3adebe 100644 --- a/server/src/remote_tasks/mod.rs +++ b/server/src/remote_tasks/mod.rs @@ -26,7 +26,10 @@ const NUMBER_OF_UNCOMPRESSED_FILES: u32 = 2; /// Get tasks for all remotes // FIXME: filter for privileges -pub async fn get_tasks(filters: TaskFilters) -> Result, Error> { +pub async fn get_tasks( + filters: TaskFilters, + remote_filter: Option, +) -> Result, Error> { tokio::task::spawn_blocking(move || { let cache = get_cache()?.read()?; @@ -44,6 +47,11 @@ pub async fn get_tasks(filters: TaskFilters) -> Result, Error> let returned_tasks = cache .get_tasks(which)? .filter_map(|task| { + if let Some(remote_filter) = &remote_filter { + if task.upid.remote() != remote_filter { + return None; + } + } // TODO: Handle PBS tasks let pve_upid: Result = task.upid.upid.parse(); match pve_upid { -- 2.47.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel