From bfb1845fdc981a370539d641a5d80f438f184f07 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 9 Nov 2023 14:12:05 +0100
Subject: layout: refactor to use a RwLock on LayoutHistory

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

(limited to 'src/model')

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