Deuxfleurs/garage
34
65
Fork 83
Code Issues 95 Pull requests 16 Releases 32 Wiki Activity

WIP: Garage v2 #948

Draft
lx wants to merge 125 commits from next-v2 into main
pull from: next-v2
merge into: Deuxfleurs:main
Conversation 0 Commits 125 Files changed 113 +4 -7
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e83864af24 - Show all commits

9
src/api/admin/cluster.rs
View file

@ -248,8 +248,8 @@ impl RequestHandler for GetClusterLayoutHistoryRequest {
garage: &Arc<Garage>, garage: &Arc<Garage>,
_admin: &Admin, _admin: &Admin,
) -> Result<GetClusterLayoutHistoryResponse, Error> { ) -> Result<GetClusterLayoutHistoryResponse, Error> {
let layout = garage.system.cluster_layout(); let layout_helper = garage.system.cluster_layout();
let layout = layout.inner(); let layout = layout_helper.inner();
let min_stored = layout.min_stored(); let min_stored = layout.min_stored();
let versions = layout let versions = layout
@ -289,10 +289,7 @@ impl RequestHandler for GetClusterLayoutHistoryRequest {
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let all_nodes = layout.get_all_nodes(); let all_nodes = layout.get_all_nodes();
let min_ack = layout let min_ack = layout_helper.ack_map_min();
.update_trackers
.ack_map
.min_among(&all_nodes, layout.min_stored());
let update_trackers = if layout.versions.len() > 1 { let update_trackers = if layout.versions.len() > 1 {
Some( Some(

2
src/rpc/layout/mod.rs
View file

@ -455,7 +455,7 @@ impl UpdateTracker {
} }
} }
pub fn min_among(&self, storage_nodes: &[Uuid], min_version: u64) -> u64 { fn min_among(&self, storage_nodes: &[Uuid], min_version: u64) -> u64 {
storage_nodes storage_nodes
.iter() .iter()
.map(|x| self.get(x, min_version)) .map(|x| self.get(x, min_version))