[pdm-devel] [PATCH proxmox-datacenter-manager 10/15] remote tasks: allow to force-fetch latest tasks

[Lukas Wagner <l.wagner@proxmox.com>]

This one makes sense for a manual refresh button in the remote
task view.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
 server/src/api/remote_tasks.rs |  9 +++++++--
 server/src/remote_tasks/mod.rs | 13 ++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/server/src/api/remote_tasks.rs b/server/src/api/remote_tasks.rs
index 05ce366..c55e15a 100644
--- a/server/src/api/remote_tasks.rs
+++ b/server/src/api/remote_tasks.rs
@@ -24,13 +24,18 @@ const SUBDIRS: SubdirMap = &sorted!([("list", &Router::new().get(&API_METHOD_LIS
             filters: {
                 type: TaskFilters,
                 flatten: true,
+            },
+            "force-refresh": {
+                description: "Force to fetch latest task data from remotes",
+                optional: true,
+                default: false,
             }
         },
     },
 )]
 /// Get the list of tasks for all remotes.
-async fn list_tasks(filters: TaskFilters) -> Result<Vec<TaskListItem>, Error> {
-    let tasks = remote_tasks::get_tasks(filters).await?;
+async fn list_tasks(filters: TaskFilters, force_refresh: bool) -> Result<Vec<TaskListItem>, Error> {
+    let tasks = remote_tasks::get_tasks(filters, force_refresh).await?;
 
     Ok(tasks)
 }
diff --git a/server/src/remote_tasks/mod.rs b/server/src/remote_tasks/mod.rs
index 3da6f25..171c8aa 100644
--- a/server/src/remote_tasks/mod.rs
+++ b/server/src/remote_tasks/mod.rs
@@ -26,7 +26,10 @@ const OVERLAP_S: i64 = 60;
 
 /// Get tasks for all remotes
 // FIXME: filter for privileges
-pub async fn get_tasks(filters: TaskFilters) -> Result<Vec<TaskListItem>, Error> {
+pub async fn get_tasks(
+    filters: TaskFilters,
+    force_refresh: bool,
+) -> Result<Vec<TaskListItem>, Error> {
     let (remotes, _) = pdm_config::remotes::config()?;
 
     let mut all_tasks = Vec::new();
@@ -45,14 +48,18 @@ pub async fn get_tasks(filters: TaskFilters) -> Result<Vec<TaskListItem>, Error>
     // a task's endtime, which is only returned by
     // /nodes/<node>/tasks...
     // Room for improvements in the future.
-    let force_refresh_remotes = get_remotes_with_finished_tasks();
+    let remotes_with_finished_tasks = get_remotes_with_finished_tasks();
 
     let now = proxmox_time::epoch_i64();
     for (remote_name, remote) in &remotes.sections {
         let last_fetched = cache.get_last_fetched(remote_name).unwrap_or(0);
         let diff = now - last_fetched;
 
-        if diff > REFRESH_EVERY_S || diff < 0 || force_refresh_remotes.contains(remote_name) {
+        let data_too_old = diff > REFRESH_EVERY_S;
+        let clock_jumped_backwards = diff < 0;
+        let forced_by_finished_task = remotes_with_finished_tasks.contains(remote_name);
+
+        if data_too_old || clock_jumped_backwards || forced_by_finished_task || force_refresh {
             // Add some overlap so that we for sure fetch every task - duplicates
             // are remove when adding the tasks to the cache.
             let fetch_since =
-- 
2.39.5



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel