Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix network Heal command #578

Merged
merged 2 commits into from
Jul 5, 2024
Merged

Fix network Heal command #578

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12668ac
Run network Heal command iteratively to bring more clarity to the output
pietrodimarco-dfinity Jul 5, 2024
3f1d366
Run rustfmt
pietrodimarco-dfinity Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions rs/cli/src/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use decentralization::network::{AvailableNodesQuerier, SubnetChange, SubnetQueri
use decentralization::network::{NetworkHealRequest, TopologyManager};
use decentralization::subnets::NodesRemover;
use decentralization::SubnetChangeResponse;
use futures::future::join_all;
use futures::TryFutureExt;
use futures_util::future::try_join;
use ic_base_types::PrincipalId;
Expand Down Expand Up @@ -471,6 +470,7 @@ impl Runner {

pub async fn network_heal(&self, max_replaceable_nodes_per_sub: Option<usize>, _verbose: bool, simulate: bool) -> Result<(), anyhow::Error> {
let health_client = health::HealthClient::new(self.registry().await.network());
let mut errors = Vec::new();
let subnets = self.registry().await.subnets();
let (available_nodes, healths) = try_join(
self.registry().await.available_nodes().map_err(anyhow::Error::from),
Expand All @@ -483,22 +483,20 @@ impl Runner {
.await?;
subnets_change_response.iter().for_each(|change| println!("{}", change));

let errors = join_all(subnets_change_response.iter().map(|subnet_change_response| async move {
self.run_membership_change(
subnet_change_response.clone(),
ops_subnet_node_replace::replace_proposal_options(subnet_change_response)?,
simulate,
)
.await
.map_err(|e| {
println!("{}", e);
e
})
}))
.await
.into_iter()
.filter_map(|f| f.err())
.collect::<Vec<_>>();
for change in subnets_change_response.iter() {
let change_result = self
.run_membership_change(change.clone(), ops_subnet_node_replace::replace_proposal_options(change)?, simulate)
.await
.map_err(|e| {
println!("{}", e);
e
});

if change_result.is_err() {
errors.push(change_result)
}
}

if !errors.is_empty() {
anyhow::bail!("Errors: {:?}", errors);
}
Expand Down
Loading