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/helper | |
| 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/helper')
| -rw-r--r-- | src/model/helper/bucket.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/model/helper/bucket.rs b/src/model/helper/bucket.rs index 576d03f3..efa3e27b 100644 --- a/src/model/helper/bucket.rs +++ b/src/model/helper/bucket.rs @@ -450,10 +450,12 @@ impl<'a> BucketHelper<'a> { #[cfg(feature = "k2v")] { - use garage_rpc::ring::Ring; - use std::sync::Arc; - - let ring: Arc<Ring> = self.0.system.ring.borrow().clone(); + let node_id_vec = self + .0 + .system + .cluster_layout() + .all_nongateway_nodes() + .to_vec(); let k2vindexes = self .0 .k2v @@ -462,7 +464,7 @@ impl<'a> BucketHelper<'a> { .get_range( &bucket_id, None, - Some((DeletedFilter::NotDeleted, ring.layout.node_id_vec.clone())), + Some((DeletedFilter::NotDeleted, node_id_vec)), 10, EnumerationOrder::Forward, ) |