gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-12 23:36:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

layout: refactor to use a RwLock on LayoutHistory

Browse Source
This commit is contained in:
Alex Auvolat
2023-11-09 14:12:05 +01:00
parent 19ef1ec8e7
commit bfb1845fdc
8 changed files with 82 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/k2v/index.rs
+4 -7
View File
@@ -5,7 +5,6 @@ use serde::Serialize;
use garage_util::data::*;
use garage_rpc::layout::LayoutHistory;
use garage_table::util::*;
use garage_model::garage::Garage;
@@ -26,7 +25,8 @@ pub async fn handle_read_index(
) -> Result<Response<Body>, Error> {
let reverse = reverse.unwrap_or(false);
let layout: Arc<LayoutHistory> = garage.system.cluster_layout().clone();
// TODO: not only current
let node_id_vec = garage.system.cluster_layout().current().node_ids().to_vec();
let (partition_keys, more, next_start) = read_range(
&garage.k2v.counter_table.table,
@@ -35,10 +35,7 @@ pub async fn handle_read_index(
&start,
&end,
limit,
Some((
DeletedFilter::NotDeleted,
layout.current().node_id_vec.clone(),
)),
Some((DeletedFilter::NotDeleted, node_id_vec)),
EnumerationOrder::from_reverse(reverse),
)
.await?;
@@ -57,7 +54,7 @@ pub async fn handle_read_index(
partition_keys: partition_keys
.into_iter()
.map(|part| {
let vals = part.filtered_values(&layout);
let vals = part.filtered_values(&garage.system.cluster_layout());
ReadIndexResponseEntry {
pk: part.sk,
entries: *vals.get(&s_entries).unwrap_or(&0),