From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E04631FF16E for ; Mon, 20 Jan 2025 10:30:17 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 207C016177; Mon, 20 Jan 2025 10:30:16 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 20 Jan 2025 10:30:00 +0100 Message-Id: <20250120093006.927014-11-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250120093006.927014-1-d.csapak@proxmox.com> References: <20250120093006.927014-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.017 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 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 3/9] server: task cache: add filter options 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" the same ones as the node task filters. Signed-off-by: Dominik Csapak --- server/src/api/remote_tasks.rs | 10 +++-- server/src/task_cache.rs | 67 +++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 5 deletions(-) diff --git a/server/src/api/remote_tasks.rs b/server/src/api/remote_tasks.rs index d15a5d0..57b59fd 100644 --- a/server/src/api/remote_tasks.rs +++ b/server/src/api/remote_tasks.rs @@ -1,5 +1,5 @@ use anyhow::Error; -use pdm_api_types::TaskListItem; +use pdm_api_types::{TaskFilters, TaskListItem}; use proxmox_router::{list_subdirs_api_method, Permission, Router, SubdirMap}; use proxmox_schema::api; use proxmox_sortable_macro::sortable; @@ -27,13 +27,17 @@ const SUBDIRS: SubdirMap = &sorted!([("list", &Router::new().get(&API_METHOD_LIS // TODO: sensible default max-age default: 300, description: "Maximum age of cached task data", + }, + filters: { + type: TaskFilters, + flatten: true, } }, }, )] /// Get the list of tasks for all remotes. -async fn list_tasks(max_age: i64) -> Result, Error> { - let tasks = task_cache::get_tasks(max_age).await?; +async fn list_tasks(max_age: i64, filters: TaskFilters) -> Result, Error> { + let tasks = task_cache::get_tasks(max_age, filters).await?; Ok(tasks) } diff --git a/server/src/task_cache.rs b/server/src/task_cache.rs index 210aa5f..1faab12 100644 --- a/server/src/task_cache.rs +++ b/server/src/task_cache.rs @@ -9,7 +9,7 @@ use std::{ use anyhow::Error; use pdm_api_types::{ remotes::{Remote, RemoteType}, - RemoteUpid, TaskListItem, + RemoteUpid, TaskFilters, TaskListItem, TaskStateType, }; use proxmox_sys::fs::CreateOptions; use pve_api_types::{ListTasks, ListTasksResponse, ListTasksSource, PveUpid}; @@ -19,7 +19,8 @@ use tokio::task::JoinHandle; use crate::{api::pve, task_utils}; /// Get tasks for all remotes -pub async fn get_tasks(max_age: i64) -> Result, Error> { +// FIXME: filter for privileges +pub async fn get_tasks(max_age: i64, filters: TaskFilters) -> Result, Error> { let (remotes, _) = pdm_config::remotes::config()?; let mut all_tasks = Vec::new(); @@ -57,6 +58,55 @@ pub async fn get_tasks(max_age: i64) -> Result, Error> { let mut returned_tasks = add_running_tasks(all_tasks)?; returned_tasks.sort_by(|a, b| a.starttime.cmp(&b.starttime)); + let returned_tasks = returned_tasks + .into_iter() + .filter(|item| { + if filters.running && item.endtime.is_some() { + return false; + } + + if let Some(until) = filters.until { + if item.starttime > until { + return false; + } + } + + if let Some(since) = filters.since { + if item.starttime < since { + return false; + } + } + + if let Some(needle) = &filters.userfilter { + if !item.user.contains(needle) { + return false; + } + } + + if let Some(typefilter) = &filters.typefilter { + if !item.worker_type.contains(typefilter) { + return false; + } + } + + let state = item.status.as_ref().map(|status| tasktype(status)); + + match (state, &filters.statusfilter) { + (Some(TaskStateType::OK), _) if filters.errors => return false, + (Some(state), Some(filters)) => { + if !filters.contains(&state) { + return false; + } + } + (None, Some(_)) => return false, + _ => {} + } + + true + }) + .skip(filters.start as usize) + .take(filters.limit as usize) + .collect(); // We don't need to wait for this task to finish tokio::task::spawn_blocking(move || { @@ -459,3 +509,16 @@ pub async fn get_finished_tasks() -> Vec<(RemoteUpid, String)> { finished } + +/// Parses a task status string into a TaskStateType +pub fn tasktype(status: &str) -> TaskStateType { + if status == "unknown" || status.is_empty() { + TaskStateType::Unknown + } else if status == "OK" { + TaskStateType::OK + } else if status.starts_with("WARNINGS: ") { + TaskStateType::Warning + } else { + TaskStateType::Error + } +} -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel