diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-11-14 13:06:16 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-11-14 13:12:32 +0100 |
| commit | 1aab1f4e688ebc3f3adcb41c817c16c688a3291c (patch) | |
| tree | cf006db1b3aeb6ebff8d976aee33469ffabe75f2 /src/garage/cli/layout.rs | |
| parent | 8e292e06b3fde1d3b5b019a26eabd4f0d9ac22c3 (diff) | |
| download | garage-1aab1f4e688ebc3f3adcb41c817c16c688a3291c.tar.gz garage-1aab1f4e688ebc3f3adcb41c817c16c688a3291c.zip | |
layout: refactoring of all_nodes
Diffstat (limited to 'src/garage/cli/layout.rs')
| -rw-r--r-- | src/garage/cli/layout.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/garage/cli/layout.rs b/src/garage/cli/layout.rs index 15727448..0f01a37a 100644 --- a/src/garage/cli/layout.rs +++ b/src/garage/cli/layout.rs @@ -49,6 +49,7 @@ pub async fn cmd_assign_role( }; let mut layout = fetch_layout(rpc_cli, rpc_host).await?; + let all_nodes = layout.all_nodes().into_owned(); let added_nodes = args .node_ids @@ -58,7 +59,7 @@ pub async fn cmd_assign_role( status .iter() .map(|adv| adv.id) - .chain(layout.current().node_ids().iter().cloned()), + .chain(all_nodes.iter().cloned()), node_id, ) }) @@ -68,8 +69,7 @@ pub async fn cmd_assign_role( roles.merge(&layout.staging.get().roles); for replaced in args.replace.iter() { - let replaced_node = - find_matching_node(layout.current().node_ids().iter().cloned(), replaced)?; + let replaced_node = find_matching_node(all_nodes.iter().cloned(), replaced)?; match roles.get(&replaced_node) { Some(NodeRoleV(Some(_))) => { layout |