diff options
| author | Alex <lx@deuxfleurs.fr> | 2025-02-19 17:09:10 +0000 |
|---|---|---|
| committer | Alex <lx@deuxfleurs.fr> | 2025-02-19 17:09:10 +0000 |
| commit | 1cb0ae10a8af28937d35b29e05e2e5350d9fea4c (patch) | |
| tree | 89a86ee4195846df75c6c3d9e7cc11f013e0322b | |
| parent | 2191620af5d836045d9e1b7d98bc61acba3879ed (diff) | |
| parent | 6d798c640f523c0eb1653be9c7d89114a75b3fc3 (diff) | |
| download | garage-1cb0ae10a8af28937d35b29e05e2e5350d9fea4c.tar.gz garage-1cb0ae10a8af28937d35b29e05e2e5350d9fea4c.zip | |
Merge pull request 'fix crash in layout computation when changing all nodes of a zone to gateway mode' (#937) from baptiste/garage:fix_layout_crash into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/937
Reviewed-by: Alex <lx@deuxfleurs.fr>
| -rw-r--r-- | src/rpc/layout/version.rs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/rpc/layout/version.rs b/src/rpc/layout/version.rs index a569c7c6..b7902898 100644 --- a/src/rpc/layout/version.rs +++ b/src/rpc/layout/version.rs @@ -650,8 +650,11 @@ impl LayoutVersion { let mut cost = CostFunction::new(); for (p, assoc_p) in prev_assign.iter().enumerate() { for n in assoc_p.iter() { - let node_zone = zone_to_id[self.expect_get_node_zone(&self.node_id_vec[*n])]; - cost.insert((Vertex::PZ(p, node_zone), Vertex::N(*n)), -1); + if let Some(&node_zone) = + zone_to_id.get(self.expect_get_node_zone(&self.node_id_vec[*n])) + { + cost.insert((Vertex::PZ(p, node_zone), Vertex::N(*n)), -1); + } } } @@ -751,8 +754,11 @@ impl LayoutVersion { if let Some(prev_assign) = prev_assign_opt { let mut old_zones_of_p = Vec::<usize>::new(); for n in prev_assign[p].iter() { - old_zones_of_p - .push(zone_to_id[self.expect_get_node_zone(&self.node_id_vec[*n])]); + if let Some(&zone_id) = + zone_to_id.get(self.expect_get_node_zone(&self.node_id_vec[*n])) + { + old_zones_of_p.push(zone_id); + } } if !old_zones_of_p.contains(&z) { new_partitions_zone[z] += 1; |