blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Turn off gossip before downloading snapshot. (#11087)

This commit is contained in:
sakridge 2020-07-16 17:05:52 -07:00 committed by GitHub
parent 862eb87184
commit b85538c532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
validator/src/main.rs
View File

@ -1216,18 +1216,21 @@ pub fn main() {
exit(1); exit(1);
} }
if !no_genesis_fetch || !no_snapshot_fetch { if !no_genesis_fetch || !no_snapshot_fetch {
let (cluster_info, gossip_exit_flag, gossip_service) = start_gossip_node(
&identity_keypair,
&cluster_entrypoint.gossip,
&node.info.gossip,
node.sockets.gossip.try_clone().unwrap(),
validator_config.expected_shred_version,
);
let mut blacklisted_rpc_nodes = HashSet::new(); let mut blacklisted_rpc_nodes = HashSet::new();
let mut gossip = None;
loop { loop {
if gossip.is_none() {
gossip = Some(start_gossip_node(
&identity_keypair,
&cluster_entrypoint.gossip,
&node.info.gossip,
node.sockets.gossip.try_clone().unwrap(),
validator_config.expected_shred_version,
));
}
let (rpc_contact_info, snapshot_hash) = get_rpc_node( let (rpc_contact_info, snapshot_hash) = get_rpc_node(
&cluster_info, &gossip.as_ref().unwrap().0,
&validator_config, &validator_config,
&mut blacklisted_rpc_nodes, &mut blacklisted_rpc_nodes,
no_snapshot_fetch, no_snapshot_fetch,
@ -1284,7 +1287,11 @@ pub fn main() {
.map_err(|err| format!("Failed to get RPC node slot: {}", err)) .map_err(|err| format!("Failed to get RPC node slot: {}", err))
.and_then(|slot| { .and_then(|slot| {
info!("RPC node root slot: {}", slot); info!("RPC node root slot: {}", slot);
download_snapshot(&rpc_contact_info.rpc, &ledger_path, snapshot_hash) let (_cluster_info, gossip_exit_flag, gossip_service) = gossip.take().unwrap();
gossip_exit_flag.store(true, Ordering::Relaxed);
let ret = download_snapshot(&rpc_contact_info.rpc, &ledger_path, snapshot_hash);
gossip_service.join().unwrap();
ret
}) })
} else { } else {
Ok(()) Ok(())
@ -1328,8 +1335,10 @@ pub fn main() {
); );
blacklisted_rpc_nodes.insert(rpc_contact_info.id); blacklisted_rpc_nodes.insert(rpc_contact_info.id);
} }
gossip_exit_flag.store(true, Ordering::Relaxed); if let Some((_cluster_info, gossip_exit_flag, gossip_service)) = gossip.take() {
gossip_service.join().unwrap(); gossip_exit_flag.store(true, Ordering::Relaxed);
gossip_service.join().unwrap();
}
} }
} }