gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve TODO

Browse Source
This commit is contained in:
Michael Vines
2019-03-06 13:58:33 -08:00
parent a3cab470d3
commit b083e4db48
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/gossip_service.rs
View File

@@ -78,18 +78,12 @@ pub fn make_listening_node(
} }
pub fn discover(entry_point_info: &NodeInfo, num_nodes: usize) -> Vec<NodeInfo> { pub fn discover(entry_point_info: &NodeInfo, num_nodes: usize) -> Vec<NodeInfo> {
converge(entry_point_info, num_nodes)
}
//TODO: deprecate this in favor of discover
pub fn converge(node: &NodeInfo, num_nodes: usize) -> Vec<NodeInfo> {
info!("Wait for convergence with {} nodes", num_nodes); info!("Wait for convergence with {} nodes", num_nodes);
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
// Let's spy on the network let (gossip_service, spy_ref, id) = make_spy_node(entry_point_info, &exit);
let (gossip_service, spy_ref, id) = make_spy_node(node, &exit);
trace!( trace!(
"converge spy_node {} looking for at least {} nodes", "discover: spy_node {} looking for at least {} nodes",
id, id,
num_nodes num_nodes
); );
@@ -97,22 +91,19 @@ pub fn converge(node: &NodeInfo, num_nodes: usize) -> Vec<NodeInfo> {
// Wait for the cluster to converge // Wait for the cluster to converge
for _ in 0..15 { for _ in 0..15 {
let rpc_peers = spy_ref.read().unwrap().rpc_peers(); let rpc_peers = spy_ref.read().unwrap().rpc_peers();
if rpc_peers.len() >= num_nodes { info!(
debug!( "discover: spy_node {} found {}/{} nodes",
"converge found {}/{} nodes: {:?}", id,
rpc_peers.len(), rpc_peers.len(),
num_nodes, num_nodes,
rpc_peers
); );
if rpc_peers.len() >= num_nodes {
exit.store(true, Ordering::Relaxed); exit.store(true, Ordering::Relaxed);
gossip_service.join().unwrap(); gossip_service.join().unwrap();
return rpc_peers; return rpc_peers;
} }
debug!( debug!(
"spy_node: {} converge found {}/{} nodes, need {} more", "discover: expecting an additional {} nodes",
id,
rpc_peers.len(),
num_nodes,
num_nodes - rpc_peers.len() num_nodes - rpc_peers.len()
); );
sleep(Duration::new(1, 0)); sleep(Duration::new(1, 0));