[pdm-devel] [PATCH proxmox-datacenter-manager v4 24/26] metric collection: factor out handle_tick and handle_control_message fns

From: Lukas Wagner <l.wagner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v4 24/26] metric collection: factor out handle_tick and handle_control_message fns
Date: Mon, 12 May 2025 15:37:23 +0200	[thread overview]
Message-ID: <20250512133725.262263-25-l.wagner@proxmox.com> (raw)
In-Reply-To: <20250512133725.262263-1-l.wagner@proxmox.com>

No functional changes, just moving some code into seperate methods for
better readability.

Suggested-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---

Notes:
    New in v2.

 .../src/metric_collection/collection_task.rs  | 96 +++++++++++--------
 1 file changed, 55 insertions(+), 41 deletions(-)

diff --git a/server/src/metric_collection/collection_task.rs b/server/src/metric_collection/collection_task.rs
index eec84c5a..39cba7fb 100644
--- a/server/src/metric_collection/collection_task.rs
+++ b/server/src/metric_collection/collection_task.rs
@@ -90,49 +90,12 @@ impl MetricCollectionTask {
                 _ = timer.tick() => {
                     // Reload settings in case they have changed in the meanwhile
                     self.settings = Self::get_settings_or_default();
-
-                    log::debug!("starting metric collection from all remotes - triggered by timer");
-
-                    if let Some(remotes) = Self::load_remote_config() {
-                        self.cleanup_removed_remotes_from_state(&remotes);
-
-                        let now = Instant::now();
-                        let to_fetch = remotes.iter().map(|(name, _)| name.into()).collect::<Vec<String>>();
-                        self.fetch_remotes(&remotes, &to_fetch).await;
-                        let elapsed = now.elapsed();
-
-                        if let Err(err) = self.metric_data_tx.send(
-                            RrdStoreRequest::CollectionStats {
-                                timestamp: proxmox_time::epoch_i64(),
-                                stats: CollectionStats {
-                                    // TODO: use as_millis_f64 once stabilized
-                                    total_time: elapsed.as_secs_f64() * 1000.
-                                }
-                            }).await {
-                            log::error!("could not send collection stats to rrd task: {err}");
-                        }
-                    }
+                    self.handle_tick().await;
                 }
-
-                val = self.control_message_rx.recv() => {
-                    // Reload settings in case they have changed in the meanwhile
+                Some(message) = self.control_message_rx.recv() => {
+                    // Reload settings in case they have changed in the meanwhile.
                     self.settings = Self::get_settings_or_default();
-                    match val {
-                        Some(ControlMsg::CollectSingleRemote(remote)) => {
-                            if let Some(remotes) = Self::load_remote_config() {
-                                log::debug!("starting metric collection for remote '{remote}'- triggered by control message");
-                                self.fetch_remotes(&remotes, &[remote]).await;
-                            }
-                        }
-                        Some(ControlMsg::CollectAllRemotes) => {
-                            if let Some(remotes) = Self::load_remote_config() {
-                                log::debug!("starting metric collection from all remotes - triggered by control message");
-                                let to_fetch = remotes.iter().map(|(name, _)| name.into()).collect::<Vec<String>>();
-                                self.fetch_remotes(&remotes, &to_fetch).await;
-                            }
-                        }
-                        _ => {},
-                    }
+                    self.handle_control_message(message).await;
                 }
             }
 
@@ -155,6 +118,57 @@ impl MetricCollectionTask {
         }
     }
 
+    /// Handle a timer tick.
+    async fn handle_tick(&mut self) {
+        log::debug!("starting metric collection from all remotes - triggered by timer");
+
+        if let Some(remotes) = Self::load_remote_config() {
+            self.cleanup_removed_remotes_from_state(&remotes);
+
+            let now = Instant::now();
+            let to_fetch = remotes
+                .iter()
+                .map(|(name, _)| name.into())
+                .collect::<Vec<String>>();
+            self.fetch_remotes(&remotes, &to_fetch).await;
+            let elapsed = now.elapsed();
+
+            if let Err(err) = self
+                .metric_data_tx
+                .send(RrdStoreRequest::CollectionStats {
+                    timestamp: proxmox_time::epoch_i64(),
+                    stats: CollectionStats {
+                        // TODO: use as_millis_f64 once stabilized
+                        total_time: elapsed.as_secs_f64() * 1000.,
+                    },
+                })
+                .await
+            {
+                log::error!("could not send collection stats to rrd task: {err}");
+            }
+        }
+    }
+
+    /// Handle a control message for force-triggered collection.
+    async fn handle_control_message(&mut self, message: ControlMsg) {
+        if let Some(remotes) = Self::load_remote_config() {
+            match message {
+                ControlMsg::CollectSingleRemote(remote) => {
+                    log::debug!("starting metric collection for remote '{remote}'- triggered by control message");
+                    self.fetch_remotes(&remotes, &[remote]).await;
+                }
+                ControlMsg::CollectAllRemotes => {
+                    log::debug!("starting metric collection from all remotes - triggered by control message");
+                    let to_fetch = remotes
+                        .iter()
+                        .map(|(name, _)| name.into())
+                        .collect::<Vec<String>>();
+                    self.fetch_remotes(&remotes, &to_fetch).await;
+                }
+            }
+        }
+    }
+
     fn cleanup_removed_remotes_from_state(&mut self, remotes: &SectionConfigData<Remote>) {
         self.state.retain(|remote| remotes.get(remote).is_some());
     }
-- 
2.39.5



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

