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/api/k2v/index.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/api/k2v/index.rs')
| -rw-r--r-- | src/api/k2v/index.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/api/k2v/index.rs b/src/api/k2v/index.rs index 6c1d4a91..e8cd1fba 100644 --- a/src/api/k2v/index.rs +++ b/src/api/k2v/index.rs @@ -5,7 +5,6 @@ use serde::Serialize; use garage_util::data::*; -use garage_rpc::ring::Ring; use garage_table::util::*; use garage_model::garage::Garage; @@ -26,7 +25,11 @@ pub async fn handle_read_index( ) -> Result<Response<Body>, Error> { let reverse = reverse.unwrap_or(false); - let ring: Arc<Ring> = garage.system.ring.borrow().clone(); + let node_id_vec = garage + .system + .cluster_layout() + .all_nongateway_nodes() + .to_vec(); let (partition_keys, more, next_start) = read_range( &garage.k2v.counter_table.table, @@ -35,7 +38,7 @@ pub async fn handle_read_index( &start, &end, limit, - Some((DeletedFilter::NotDeleted, ring.layout.node_id_vec.clone())), + Some((DeletedFilter::NotDeleted, node_id_vec)), EnumerationOrder::from_reverse(reverse), ) .await?; @@ -54,7 +57,7 @@ pub async fn handle_read_index( partition_keys: partition_keys .into_iter() .map(|part| { - let vals = part.filtered_values(&ring); + let vals = part.filtered_values(&garage.system.cluster_layout()); ReadIndexResponseEntry { pk: part.sk, entries: *vals.get(&s_entries).unwrap_or(&0), |