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/helper/bucket.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/helper/bucket.rs')
| -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 4ae9122f..e5506d7e 100644 --- a/src/model/helper/bucket.rs +++ b/src/model/helper/bucket.rs @@ -155,10 +155,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 @@ -167,7 +169,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, ) |