3 files changed, 17 insertions, 3 deletions

diff --git a/src/swarm/peer/forget.rs b/src/swarm/peer/forget.rs
index 3a97677..68266d5 100644
--- a/src/swarm/peer/forget.rs
+++ b/src/swarm/peer/forget.rs
@@ -24,6 +24,13 @@ pub(crate) fn forgotten_path(pk: &str) -> Vec<String> {
     path
 }
 
+/// Whether a change at `path` may change the forget records: one among them, or above
+/// them (the root, after an epoch switch).
+pub(crate) fn affects_forget_records(path: &[String]) -> bool {
+    let dir = forgotten_dir();
+    path.starts_with(&dir) || dir.starts_with(path)
+}
+
 fn forgotten_peers(doc: &Document) -> Vec<String> {
     store::keys_at(doc, &forgotten_dir()).unwrap_or_default()
 }
diff --git a/src/swarm/peer/mod.rs b/src/swarm/peer/mod.rs
index 589f48c..d1dea9b 100644
--- a/src/swarm/peer/mod.rs
+++ b/src/swarm/peer/mod.rs
@@ -20,7 +20,7 @@ mod keepalive;
 mod lanes;
 mod worker;
 
-pub(crate) use forget::{forget_unless_alive, forgotten_path};
+pub(crate) use forget::{affects_forget_records, forget_unless_alive, forgotten_path};
 pub(crate) use handshake::{
     apply_neighbour_change, peer_swarm, rehandshake, remember_peer, send_hello_once,
 };
diff --git a/src/swarm/peer/worker.rs b/src/swarm/peer/worker.rs
index 546f867..e8e6f8b 100644
--- a/src/swarm/peer/worker.rs
+++ b/src/swarm/peer/worker.rs
@@ -1,7 +1,8 @@
 //! The peer worker: keepalives due, dormancy, HELLO retries and overdue sync replies,
 //! when the earliest of them is due (or something may have made one due sooner,
 //! `Due`); every `FORGET_CHECK_INTERVAL` (and at once when the node becomes ready),
-//! forget records, the member registry, stability, measurements and the state file.
+//! forget records, the member registry, stability, measurements and the state file;
+//! forget records also at once when they changed.
 
 use std::time::Duration;
 
@@ -152,8 +153,14 @@ pub(crate) async fn run_peer_worker(state: AppState) {
                 .unwrap_or(next);
         }
 
-        if last_forget_check.is_none_or(|t| t.elapsed() >= FORGET_CHECK_INTERVAL) {
+        let records_changed = state
+            .forget_records_changed
+            .swap(false, std::sync::atomic::Ordering::AcqRel);
+        let periodic = last_forget_check.is_none_or(|t| t.elapsed() >= FORGET_CHECK_INTERVAL);
+        if records_changed || periodic {
             apply_forget_records(&state, &mut forgets_applied).await;
+        }
+        if periodic {
             forget_strangers(&state).await;
             crate::swarm::members::ensure_registered(&state).await;
             crate::swarm::stability::tick(&state).await;