Report number of nodes found on failure too

This commit is contained in:
Michael Vines
2018-07-30 10:55:05 -07:00
parent 3e351b0b13
commit f27613754a

View File

@ -656,10 +656,10 @@ fn converge(
gossip_send_socket, gossip_send_socket,
exit_signal.clone(), exit_signal.clone(),
).expect("DataReplicator::new"); ).expect("DataReplicator::new");
let mut rv = vec![]; let mut v: Vec<NodeInfo> = vec![];
//wait for the network to converge, 30 seconds should be plenty //wait for the network to converge, 30 seconds should be plenty
for _ in 0..30 { for _ in 0..30 {
let v: Vec<NodeInfo> = spy_ref v = spy_ref
.read() .read()
.unwrap() .unwrap()
.table .table
@ -670,7 +670,6 @@ fn converge(
.collect(); .collect();
if v.len() >= num_nodes { if v.len() >= num_nodes {
println!("CONVERGED!"); println!("CONVERGED!");
rv.extend(v.into_iter());
break; break;
} else { } else {
println!( println!(
@ -682,7 +681,7 @@ fn converge(
sleep(Duration::new(1, 0)); sleep(Duration::new(1, 0));
} }
threads.extend(ncp.thread_hdls().into_iter()); threads.extend(ncp.thread_hdls().into_iter());
rv v
} }
fn read_leader(path: &str) -> Config { fn read_leader(path: &str) -> Config {