From 8dccee3ccfe7793c42203f28c1e91c6f989b6899 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 8 Nov 2023 19:28:36 +0100
Subject: cluster layout: adapt all uses of ClusterLayout to LayoutHistory

---
 src/model/helper/bucket.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/model/helper')

diff --git a/src/model/helper/bucket.rs b/src/model/helper/bucket.rs
index 8cd5b27b..18904c8d 100644
--- a/src/model/helper/bucket.rs
+++ b/src/model/helper/bucket.rs
@@ -450,10 +450,10 @@ impl<'a> BucketHelper<'a> {
 
 		#[cfg(feature = "k2v")]
 		{
-			use garage_rpc::layout::ClusterLayout;
+			use garage_rpc::layout::LayoutHistory;
 			use std::sync::Arc;
 
-			let layout: Arc<ClusterLayout> = self.0.system.cluster_layout().clone();
+			let layout: Arc<LayoutHistory> = self.0.system.cluster_layout().clone();
 			let k2vindexes = self
 				.0
 				.k2v
@@ -462,7 +462,10 @@ impl<'a> BucketHelper<'a> {
 				.get_range(
 					&bucket_id,
 					None,
-					Some((DeletedFilter::NotDeleted, layout.node_id_vec.clone())),
+					Some((
+						DeletedFilter::NotDeleted,
+						layout.current().node_id_vec.clone(),
+					)),
 					10,
 					EnumerationOrder::Forward,
 				)
-- 
cgit v1.2.3