Deuxfleurs/garage
47
55
Fork 72
Code Issues 99 Pull requests 14 Releases 30 Wiki Activity

Consider both old and current versions when verifying layout history
Some checks failed
ci/woodpecker/pr/debug Pipeline failed
Details

Browse source
This commit is contained in:
Dominik Grygiel 2024-08-19 18:37:09 +02:00
parent f8d0affd82
commit 824e473809
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,12 +226,12 @@ impl LayoutHistory {
// Add any new versions to history
for v2 in other.old_versions.iter().chain(other.versions.iter()) {
if let Some(v1) = 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.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,