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

Fix up trusted validator snapshot selection

Browse Source
This commit is contained in:
Michael Vines
2020-02-23 17:10:20 -07:00
parent b106d3ba60
commit 394933e53c
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
validator/src/main.rs
View File

@ -250,14 +250,16 @@ fn get_rpc_addr(
}
let trusted_slots = if let Some(trusted_validators) = trusted_validators {
let trusted_slots = HashSet::new();
let mut trusted_slots = HashSet::new();
for trusted_validator in trusted_validators {
if let Some(slot_hash) = cluster_info
if let Some(snapshot_hashes) = cluster_info
.read()
.unwrap()
.get_snapshot_hash_for_node(trusted_validator)
{
trusted_slots.union(&slot_hash.iter().collect());
for snapshot_hash in snapshot_hashes {
trusted_slots.insert(*snapshot_hash);
}
}
}
Some(trusted_slots)
@ -291,6 +293,7 @@ fn get_rpc_addr(
highest_slot.max(snapshot_hash.0)
});
if highest_snapshot_slot_for_node > 0 {
if highest_snapshot_slot_for_node > highest_snapshot_slot {
// Found a higher snapshot, remove all rpc peers with a lower snapshot
eligible_rpc_peers.clear();
@ -302,6 +305,7 @@ fn get_rpc_addr(
}
}
}
}
if highest_snapshot_slot == 0 {
assert!(eligible_rpc_peers.is_empty());