gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-31 01:09:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[next-0.10] cache layout check result

Browse Source
This commit is contained in:
Alex Auvolat
2024-03-27 13:37:20 +01:00
parent 01a0bd5410
commit 32f1786f9f
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/layout/manager.rs
+2 -2
View File
@@ -160,12 +160,12 @@ impl LayoutManager {
fn merge_layout(&self, adv: &LayoutHistory) -> Option<LayoutHistory> {
let mut layout = self.layout.write().unwrap();
let prev_digest = layout.digest();
let prev_layout_check = layout.inner().check().is_ok();
let prev_layout_check = layout.is_check_ok();
if !prev_layout_check || adv.check().is_ok() {
if layout.update(|l| l.merge(adv)) {
layout.update_trackers(self.node_id);
if prev_layout_check && layout.inner().check().is_err() {
if prev_layout_check && !layout.is_check_ok() {
panic!("Merged two correct layouts and got an incorrect layout.");
}
assert!(layout.digest() != prev_digest);