From 12d1dbfc6b884be488e2d79c0b9e3c47490f5442 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 8 Nov 2023 15:41:24 +0100
Subject: remove Ring and use ClusterLayout everywhere

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

(limited to 'src/model/index_counter.rs')

diff --git a/src/model/index_counter.rs b/src/model/index_counter.rs
index a46c165f..d514cb06 100644
--- a/src/model/index_counter.rs
+++ b/src/model/index_counter.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 
 use garage_db as db;
 
-use garage_rpc::ring::Ring;
+use garage_rpc::layout::ClusterLayout;
 use garage_rpc::system::System;
 use garage_util::background::BackgroundRunner;
 use garage_util::data::*;
@@ -83,8 +83,8 @@ impl<T: CountedItem> Entry<T::CP, T::CS> for CounterEntry<T> {
 }
 
 impl<T: CountedItem> CounterEntry<T> {
-	pub fn filtered_values(&self, ring: &Ring) -> HashMap<String, i64> {
-		let nodes = &ring.layout.node_id_vec[..];
+	pub fn filtered_values(&self, layout: &ClusterLayout) -> HashMap<String, i64> {
+		let nodes = &layout.node_id_vec[..];
 		self.filtered_values_with_nodes(nodes)
 	}
 
-- 
cgit v1.2.3


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/index_counter.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/model/index_counter.rs')

diff --git a/src/model/index_counter.rs b/src/model/index_counter.rs
index d514cb06..9637cc4c 100644
--- a/src/model/index_counter.rs
+++ b/src/model/index_counter.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 
 use garage_db as db;
 
-use garage_rpc::layout::ClusterLayout;
+use garage_rpc::layout::LayoutHistory;
 use garage_rpc::system::System;
 use garage_util::background::BackgroundRunner;
 use garage_util::data::*;
@@ -83,8 +83,8 @@ impl<T: CountedItem> Entry<T::CP, T::CS> for CounterEntry<T> {
 }
 
 impl<T: CountedItem> CounterEntry<T> {
-	pub fn filtered_values(&self, layout: &ClusterLayout) -> HashMap<String, i64> {
-		let nodes = &layout.node_id_vec[..];
+	pub fn filtered_values(&self, layout: &LayoutHistory) -> HashMap<String, i64> {
+		let nodes = &layout.current().node_id_vec[..];
 		self.filtered_values_with_nodes(nodes)
 	}
 
-- 
cgit v1.2.3


From 8e292e06b3fde1d3b5b019a26eabd4f0d9ac22c3 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 14 Nov 2023 12:48:38 +0100
Subject: layout: some refactoring of nongateway nodes

---
 src/model/index_counter.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/model/index_counter.rs')

diff --git a/src/model/index_counter.rs b/src/model/index_counter.rs
index 9637cc4c..2d968733 100644
--- a/src/model/index_counter.rs
+++ b/src/model/index_counter.rs
@@ -84,8 +84,8 @@ impl<T: CountedItem> Entry<T::CP, T::CS> for CounterEntry<T> {
 
 impl<T: CountedItem> CounterEntry<T> {
 	pub fn filtered_values(&self, layout: &LayoutHistory) -> HashMap<String, i64> {
-		let nodes = &layout.current().node_id_vec[..];
-		self.filtered_values_with_nodes(nodes)
+		let nodes = layout.all_nongateway_nodes();
+		self.filtered_values_with_nodes(&nodes)
 	}
 
 	pub fn filtered_values_with_nodes(&self, nodes: &[Uuid]) -> HashMap<String, i64> {
-- 
cgit v1.2.3


From 393c4d4515e0cdadadc8de8ae2df12e4371cff88 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 15 Nov 2023 14:20:50 +0100
Subject: layout: add helper for cached/external values to centralize
 recomputation

---
 src/model/index_counter.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/model/index_counter.rs')

diff --git a/src/model/index_counter.rs b/src/model/index_counter.rs
index 2d968733..e8702bf1 100644
--- a/src/model/index_counter.rs
+++ b/src/model/index_counter.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 
 use garage_db as db;
 
-use garage_rpc::layout::LayoutHistory;
+use garage_rpc::layout::LayoutHelper;
 use garage_rpc::system::System;
 use garage_util::background::BackgroundRunner;
 use garage_util::data::*;
@@ -83,7 +83,7 @@ impl<T: CountedItem> Entry<T::CP, T::CS> for CounterEntry<T> {
 }
 
 impl<T: CountedItem> CounterEntry<T> {
-	pub fn filtered_values(&self, layout: &LayoutHistory) -> HashMap<String, i64> {
+	pub fn filtered_values(&self, layout: &LayoutHelper) -> HashMap<String, i64> {
 		let nodes = layout.all_nongateway_nodes();
 		self.filtered_values_with_nodes(&nodes)
 	}
-- 
cgit v1.2.3