Deuxfleurs/garage
43
56
Fork 74
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

layout: discard old info when it is completely out-of-date (fix #841) #861

Merged
lx merged 1 commit from fix-841 into main 2024-08-24 11:12:39 +00:00
Conversation 0 Commits 1 Files changed 1 +14 -9
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7fb66b4944 - Show all commits

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

@ -227,24 +227,29 @@ impl LayoutHistory {
// ================== updates to layout, public interface =================== // ================== updates to layout, public interface ===================
pub fn merge(&mut self, other: &LayoutHistory) -> bool { pub fn merge(&mut self, other: &LayoutHistory) -> bool {
// If our current layout version is completely out-of-date,
// forget everything we know and replace it by incoming layout data.
if self.current().version < other.min_stored() {
*self = other.clone();
return true;
}
let mut changed = false; let mut changed = false;
// Add any new versions to history // Add any new versions to history
for v2 in other.versions.iter() { for v2 in other.versions.iter() {
if let Some(v1) = self.versions.iter().find(|v| v.version == v2.version) { if v2.version == self.current().version + 1 {
// This is the next version, add it to our version list
self.versions.push(v2.clone());
changed = true;
} else if let Some(v1) = self.versions.iter().find(|v| v.version == v2.version) {
// Version is already present, check consistency // Version is already present, check consistency
if v1 != v2 { if v1 != v2 {
error!("Inconsistent layout histories: different layout compositions for version {}. Your cluster will be broken as long as this layout version is not replaced.", v2.version); error!("Inconsistent layout histories: different layout compositions for version {}. Your cluster will be broken as long as this layout version is not replaced.", v2.version);
} }
} else if self.versions.iter().all(|v| v.version != v2.version - 1) {
error!(
"Cannot receive new layout version {}, version {} is missing",
v2.version,
v2.version - 1
);
} else { } else {
self.versions.push(v2.clone()); // This is an older version
changed = true; assert!(v2.version < self.min_stored());
} }
} }