Deuxfleurs/garage
45
52
Fork 67
Code Issues 92 Pull requests 9 Releases 29 Wiki Activity

Include old_versions when merging layouts, don't remove old layout versions #854

Closed
dominik wants to merge 3 commits from dominik/garage:historical_layout_fix into main
pull from: dominik/garage:historical_layout_fix
merge into: Deuxfleurs:main
Conversation 1 Commits 3 Files changed 2 +12 -2
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b5cefc0a99 - Show all commits

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

@ -226,12 +226,22 @@ impl LayoutHistory {
// Add any new versions to history
for v2 in other.old_versions.iter().chain(other.versions.iter()) {
if let Some(v1) = self.old_versions.iter().chain(self.versions.iter()).find(|v| v.version == v2.version) {
if let Some(v1) = self
.old_versions
.iter()
.chain(self.versions.iter())
.find(|v| v.version == v2.version)
{
// Version is already present, check consistency
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);
}
} else if self.old_versions.iter().chain(self.versions.iter()).all(|v| v.version != v2.version - 1) {
} else if self
.old_versions
.iter()
.chain(self.versions.iter())
.all(|v| v.version != v2.version - 1)
{
error!(
"Cannot receive new layout version {}, version {} is missing",
v2.version,