diff options
| author | Alex <alex@adnab.me> | 2024-01-11 10:58:08 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-01-11 10:58:08 +0000 |
| commit | 8a6ec1d6111a60e602c90ade2200b2dab5733fe3 (patch) | |
| tree | b8daac4f41050339c87106d72ce7224f7eef38aa /src/model/index_counter.rs | |
| parent | 723e56b37f13f078a15e067343191fb1bf96e8b2 (diff) | |
| parent | 0041b013a473e3ae72f50209d8f79db75a72848b (diff) | |
| download | garage-8a6ec1d6111a60e602c90ade2200b2dab5733fe3.tar.gz garage-8a6ec1d6111a60e602c90ade2200b2dab5733fe3.zip | |
Merge pull request 'NLnet task 3' (#667) from nlnet-task3 into next-0.10
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/667
Diffstat (limited to 'src/model/index_counter.rs')
| -rw-r--r-- | src/model/index_counter.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/model/index_counter.rs b/src/model/index_counter.rs index a46c165f..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::ring::Ring; +use garage_rpc::layout::LayoutHelper; use garage_rpc::system::System; use garage_util::background::BackgroundRunner; use garage_util::data::*; @@ -83,9 +83,9 @@ 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[..]; - self.filtered_values_with_nodes(nodes) + pub fn filtered_values(&self, layout: &LayoutHelper) -> HashMap<String, i64> { + let nodes = layout.all_nongateway_nodes(); + self.filtered_values_with_nodes(&nodes) } pub fn filtered_values_with_nodes(&self, nodes: &[Uuid]) -> HashMap<String, i64> { |