[pdm-devel] [PATCH proxmox-datacenter-manager v5 14/23] metric collection: periodically clean removed remotes from statefile

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

Adding and removing remotes can leave leftover data in the statefile,
hence it makes sense to clean it up periodically.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 .../src/metric_collection/collection_task.rs  |  6 ++++
 server/src/metric_collection/state.rs         | 32 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/server/src/metric_collection/collection_task.rs b/server/src/metric_collection/collection_task.rs
index 4013c59f..b960efff 100644
--- a/server/src/metric_collection/collection_task.rs
+++ b/server/src/metric_collection/collection_task.rs
@@ -91,6 +91,8 @@ impl MetricCollectionTask {
                     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;
@@ -136,6 +138,10 @@ impl MetricCollectionTask {
         }
     }
 
+    fn cleanup_removed_remotes_from_state(&mut self, remotes: &SectionConfigData<Remote>) {
+        self.state.retain(|remote| remotes.get(remote).is_some());
+    }
+
     /// Set up a [`tokio::time::Interval`] instance with the provided interval.
     /// The timer will be aligned, e.g. an interval of `60` will let the timer
     /// fire at minute boundaries.
diff --git a/server/src/metric_collection/state.rs b/server/src/metric_collection/state.rs
index e76444a9..7f68843e 100644
--- a/server/src/metric_collection/state.rs
+++ b/server/src/metric_collection/state.rs
@@ -74,6 +74,11 @@ impl MetricCollectionState {
         Ok(())
     }
 
+    /// Retain all remotes for which the predicate holds.
+    pub fn retain(&mut self, check: impl Fn(&str) -> bool) {
+        self.state.remote_status.retain(|remote, _| check(remote));
+    }
+
     fn load_or_default(path: &Path) -> Result<State, Error> {
         let content = proxmox_sys::fs::file_read_optional_string(path)?;
 
@@ -115,4 +120,31 @@ mod tests {
 
         Ok(())
     }
+
+    #[test]
+    fn test_retain() -> Result<(), Error> {
+        let file = NamedTempFile::new(get_create_options())?;
+        let options = get_create_options();
+        let mut state = MetricCollectionState::new(file.path().into(), options);
+
+        state.set_status(
+            "remote-1".into(),
+            RemoteStatus {
+                ..Default::default()
+            },
+        );
+        state.set_status(
+            "remote-2".into(),
+            RemoteStatus {
+                ..Default::default()
+            },
+        );
+
+        state.retain(|remote| remote == "remote-1");
+
+        assert!(state.get_status("remote-1").is_some());
+        assert!(state.get_status("remote-2").is_none());
+
+        Ok(())
+    }
 }
-- 
2.47.2



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