[pdm-devel] [PATCH proxmox-datacenter-manager 08/12] task cache: use separate functions for tracking PVE and PBS tasks

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

At the callsite we always know which type of remote it is, so there is
no need to deduce the type from the UPID itself.

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

diff --git a/server/src/api/pve/mod.rs b/server/src/api/pve/mod.rs
index 0de82323..a94ab8d0 100644
--- a/server/src/api/pve/mod.rs
+++ b/server/src/api/pve/mod.rs
@@ -84,8 +84,7 @@ const STATUS_ROUTER: Router = Router::new().get(&API_METHOD_CLUSTER_STATUS);
 
 // converts a remote + PveUpid into a RemoteUpid and starts tracking it
 pub async fn new_remote_upid(remote: String, upid: PveUpid) -> Result<RemoteUpid, Error> {
-    let remote_upid: RemoteUpid = (remote, upid.to_string()).try_into()?;
-    remote_tasks::track_running_task(remote_upid.clone()).await?;
+    let remote_upid = remote_tasks::track_running_pve_task(remote, upid).await?;
     Ok(remote_upid)
 }
 
diff --git a/server/src/remote_tasks/mod.rs b/server/src/remote_tasks/mod.rs
index b3adebe2..c4939742 100644
--- a/server/src/remote_tasks/mod.rs
+++ b/server/src/remote_tasks/mod.rs
@@ -126,22 +126,53 @@ pub async fn get_tasks(
     .await?
 }
 
-/// Insert a newly created tasks into the list of tracked tasks.
+/// Insert a newly created PVE task into the list of tracked tasks.
 ///
 /// Any tracked task will be polled with a short interval until the task
 /// has finished.
-pub async fn track_running_task(task: RemoteUpid) -> Result<(), Error> {
+///
+/// This function returns the [`RemoteUpid`] of the tracked PVE task.
+pub async fn track_running_pve_task(remote: String, upid: PveUpid) -> Result<RemoteUpid, Error> {
     tokio::task::spawn_blocking(move || {
+        let remote_upid: RemoteUpid = (remote, upid.to_string()).try_into()?;
         let cache = get_cache()?.write()?;
-        // TODO:: Handle PBS tasks correctly.
-        let pve_upid: pve_api_types::PveUpid = task.upid.parse()?;
+
         let task = TaskCacheItem {
-            upid: task.clone(),
-            starttime: pve_upid.starttime,
+            upid: remote_upid.clone(),
+            starttime: upid.starttime,
             status: None,
             endtime: None,
         };
-        cache.add_tracked_task(task)
+        cache.add_tracked_task(task)?;
+
+        Ok(remote_upid)
+    })
+    .await?
+}
+
+/// Insert a newly created PBS task into the list of tracked tasks.
+///
+/// Any tracked task will be polled with a short interval until the task
+/// has finished.
+///
+/// This function returns the [`RemoteUpid`] of the tracked PBS task.
+pub async fn track_running_pbs_task(
+    remote: String,
+    upid: pbs_api_types::UPID,
+) -> Result<RemoteUpid, Error> {
+    tokio::task::spawn_blocking(move || {
+        let remote_upid: RemoteUpid = (remote, upid.to_string()).try_into()?;
+        let cache = get_cache()?.write()?;
+
+        let task = TaskCacheItem {
+            upid: remote_upid.clone(),
+            starttime: upid.starttime,
+            status: None,
+            endtime: None,
+        };
+        cache.add_tracked_task(task)?;
+
+        Ok(remote_upid)
     })
     .await?
 }
-- 
2.47.3



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