Deuxfleurs/garage
42
42
Fork 58
Code Issues 80 Pull requests 9 Releases 29 Wiki Activity

NLnet task 3 #667

Merged
lx merged 60 commits from nlnet-task3 into next-0.10 2024-01-11 10:58:08 +00:00
Conversation 0 Commits 60 Files changed 41 +14 -17
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit adccce1145 - Show all commits

31
src/rpc/layout/history.rs
View file

@ -86,23 +86,20 @@ impl LayoutHistory {
// remove them (keep them in self.old_versions). // remove them (keep them in self.old_versions).
// ASSUMPTION: we only care about where nodes in the current layout version // ASSUMPTION: we only care about where nodes in the current layout version
// are reading from, as we assume older nodes are being discarded. // are reading from, as we assume older nodes are being discarded.
while self.versions.len() > 1 { let current_nodes = &self.current().node_id_vec;
let current_nodes = &self.current().node_id_vec; let min_version = self.min_stored();
let min_version = self.min_stored(); let sync_ack_map_min = self
let sync_ack_map_min = self .update_trackers
.update_trackers .sync_ack_map
.sync_ack_map .min_among(current_nodes, min_version);
.min_among(current_nodes, min_version); while self.min_stored() < sync_ack_map_min {
if self.min_stored() < sync_ack_map_min { assert!(self.versions.len() > 1);
let removed = self.versions.remove(0); let removed = self.versions.remove(0);
info!( info!(
"Layout history: moving version {} to old_versions", "Layout history: moving version {} to old_versions",
removed.version removed.version
); );
self.old_versions.push(removed); self.old_versions.push(removed);
} else {
break;
}
} }
while self.old_versions.len() > OLD_VERSION_COUNT { while self.old_versions.len() > OLD_VERSION_COUNT {