diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-11-08 19:28:36 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-11-08 19:28:36 +0100 |
| commit | 8dccee3ccfe7793c42203f28c1e91c6f989b6899 (patch) | |
| tree | 0a3fdb60229d9e3c9d61c7f01d40ed74159f1b2c /src/api/k2v | |
| parent | fe9af1dcaae31a117528a9cfa10c422c9a850201 (diff) | |
| download | garage-8dccee3ccfe7793c42203f28c1e91c6f989b6899.tar.gz garage-8dccee3ccfe7793c42203f28c1e91c6f989b6899.zip | |
cluster layout: adapt all uses of ClusterLayout to LayoutHistory
Diffstat (limited to 'src/api/k2v')
| -rw-r--r-- | src/api/k2v/index.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/api/k2v/index.rs b/src/api/k2v/index.rs index 3fc39de6..a9bc3826 100644 --- a/src/api/k2v/index.rs +++ b/src/api/k2v/index.rs @@ -5,7 +5,7 @@ use serde::Serialize; use garage_util::data::*; -use garage_rpc::layout::ClusterLayout; +use garage_rpc::layout::LayoutHistory; use garage_table::util::*; use garage_model::garage::Garage; @@ -26,7 +26,7 @@ pub async fn handle_read_index( ) -> Result<Response<Body>, Error> { let reverse = reverse.unwrap_or(false); - let layout: Arc<ClusterLayout> = garage.system.cluster_layout().clone(); + let layout: Arc<LayoutHistory> = garage.system.cluster_layout().clone(); let (partition_keys, more, next_start) = read_range( &garage.k2v.counter_table.table, @@ -35,7 +35,10 @@ pub async fn handle_read_index( &start, &end, limit, - Some((DeletedFilter::NotDeleted, layout.node_id_vec.clone())), + Some(( + DeletedFilter::NotDeleted, + layout.current().node_id_vec.clone(), + )), EnumerationOrder::from_reverse(reverse), ) .await?; |