Deuxfleurs/garage
44
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

NLnet task 3 #667

Merged
lx merged 60 commits from nlnet-task3 into next-0.10 2024-01-11 10:58:08 +00:00
Conversation 1 Commits 60 Files changed 41 +4 -2
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bad7cc812e - Show all commits

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

@ -240,6 +240,7 @@ pub async fn handle_update_cluster_layout(
.merge(&roles.update_mutator(node, layout::NodeRoleV(new_role))); .merge(&roles.update_mutator(node, layout::NodeRoleV(new_role)));
} }
layout.update_hashes();
garage garage
.system .system
.layout_manager .layout_manager

3
src/garage/cli/layout.rs
View file

@ -329,8 +329,9 @@ pub async fn fetch_layout(
pub async fn send_layout( pub async fn send_layout(
rpc_cli: &Endpoint<SystemRpc, ()>, rpc_cli: &Endpoint<SystemRpc, ()>,
rpc_host: NodeID, rpc_host: NodeID,
layout: LayoutHistory, mut layout: LayoutHistory,
) -> Result<(), Error> { ) -> Result<(), Error> {
layout.update_hashes();
rpc_cli rpc_cli
.call( .call(
&rpc_host, &rpc_host,

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

@ -40,7 +40,7 @@ impl LayoutHistory {
.collect::<HashSet<_>>() .collect::<HashSet<_>>()
} }
pub(crate) fn update_hashes(&mut self) { pub fn update_hashes(&mut self) {
self.trackers_hash = self.calculate_trackers_hash(); self.trackers_hash = self.calculate_trackers_hash();
self.staging_hash = self.calculate_staging_hash(); self.staging_hash = self.calculate_staging_hash();
} }