B: B4 empty the peer snapshot when a reload disables the feature
This commit is contained in:
1 parent
734a6ed541
commit
9d6fbd3288
2 files changed
+31
-14
No files matched your search
+30
-13
@@ -266,19 +266,25 @@ impl PeerRegistry {
|
||||
{
|
||||
let mut st = lock_write(&self.shared.state);
|
||||
let old = std::mem::take(&mut st.statuses);
|
||||
st.statuses = new
|
||||
.peer
|
||||
.iter()
|
||||
.map(|peer| {
|
||||
let mut status = old
|
||||
.get(&peer.name)
|
||||
.cloned()
|
||||
.unwrap_or_else(|| initial_status(peer));
|
||||
status.enabled = peer.enabled;
|
||||
status.url = peer.display_url();
|
||||
(peer.name.clone(), status)
|
||||
})
|
||||
.collect();
|
||||
// Turning the feature off renders an empty list rather than a
|
||||
// stale snapshot; the routes themselves stay mounted until
|
||||
// restart because the router is built once.
|
||||
st.statuses = if new.enabled {
|
||||
new.peer
|
||||
.iter()
|
||||
.map(|peer| {
|
||||
let mut status = old
|
||||
.get(&peer.name)
|
||||
.cloned()
|
||||
.unwrap_or_else(|| initial_status(peer));
|
||||
status.enabled = peer.enabled;
|
||||
status.url = peer.display_url();
|
||||
(peer.name.clone(), status)
|
||||
})
|
||||
.collect()
|
||||
} else {
|
||||
BTreeMap::new()
|
||||
};
|
||||
st.config = Arc::new(new.clone());
|
||||
}
|
||||
if self.loops_enabled {
|
||||
@@ -600,6 +606,17 @@ mod tests {
|
||||
});
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn reload_disabling_the_feature_empties_the_snapshot() {
|
||||
let reg = registry_with(FakeTransport::new(), fake_peers_config(&["beta"]));
|
||||
let mut new = fake_peers_config(&["beta"]);
|
||||
new.enabled = false;
|
||||
reg.reload(new).await.unwrap();
|
||||
assert!(reg.snapshot().is_empty());
|
||||
assert!(reg.status("beta").is_err());
|
||||
assert!(!reg.config().enabled);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn reload_moves_loops_to_the_new_peer_set() {
|
||||
let fake = FakeTransport::new();
|
||||
|
||||
Reference in new issue
Block a user