diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-11-08 15:41:24 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-11-08 15:41:24 +0100 |
| commit | 12d1dbfc6b884be488e2d79c0b9e3c47490f5442 (patch) | |
| tree | ef8c55c60dcbe98b09cbab25bc3cb7b7ede82d4a /src/model | |
| parent | 0962313ebd45abb116d6ad2ee0eb754f587fc299 (diff) | |
| download | garage-12d1dbfc6b884be488e2d79c0b9e3c47490f5442.tar.gz garage-12d1dbfc6b884be488e2d79c0b9e3c47490f5442.zip | |
remove Ring and use ClusterLayout everywhere
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/helper/bucket.rs | 6 | ||||
| -rw-r--r-- | src/model/index_counter.rs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/model/helper/bucket.rs b/src/model/helper/bucket.rs index 576d03f3..d43d7e96 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::ring::Ring; + use garage_rpc::layout::ClusterLayout; use std::sync::Arc; - let ring: Arc<Ring> = self.0.system.ring.borrow().clone(); + let layout: Arc<ClusterLayout> = self.0.system.layout_watch.borrow().clone(); let k2vindexes = self .0 .k2v @@ -462,7 +462,7 @@ impl<'a> BucketHelper<'a> { .get_range( &bucket_id, None, - Some((DeletedFilter::NotDeleted, ring.layout.node_id_vec.clone())), + Some((DeletedFilter::NotDeleted, layout.node_id_vec.clone())), 10, EnumerationOrder::Forward, ) 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) } |