diff options
| author | Alex <alex@adnab.me> | 2024-04-10 15:23:12 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-04-10 15:23:12 +0000 |
| commit | 1779fd40c0fe676bedda0d40f647d7fe8b0f1e7e (patch) | |
| tree | 47e42c4e6ae47590fbb5c8f94e90a23bf04c1674 /src/model/index_counter.rs | |
| parent | b47706809cc9d28d1328bafdf9756e96388cca24 (diff) | |
| parent | ff093ddbb8485409f389abe7b5e569cb38d222d2 (diff) | |
| download | garage-1779fd40c0fe676bedda0d40f647d7fe8b0f1e7e.tar.gz garage-1779fd40c0fe676bedda0d40f647d7fe8b0f1e7e.zip | |
Merge pull request 'Garage v1.0' (#683) from next-0.10 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/683
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 c0bf38d8..aa13ee7b 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> { |