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

broadcasts duplicate shreds through gossip (#14699)

Browse Source
This commit is contained in:
behzad nouri
2021-01-24 15:47:43 +00:00
committed by GitHub
parent cbffab7850
commit 491b059755
7 changed files with 257 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/window_service.rs
View File

@ -83,7 +83,8 @@ pub fn should_retransmit_and_persist(
}
fn run_check_duplicate(
blockstore: &Arc<Blockstore>,
cluster_info: &ClusterInfo,
blockstore: &Blockstore,
shred_receiver: &CrossbeamReceiver<Shred>,
) -> Result<()> {
let check_duplicate = |shred: Shred| -> Result<()> {
@ -94,6 +95,7 @@ fn run_check_duplicate(
&shred.payload,
shred.is_data(),
) {
cluster_info.push_duplicate_shred(&shred, &existing_shred_payload)?;
blockstore.store_duplicate_slot(
shred.slot(),
existing_shred_payload,
@ -339,8 +341,12 @@ impl WindowService {
let (insert_sender, insert_receiver) = unbounded();
let (duplicate_sender, duplicate_receiver) = unbounded();
let t_check_duplicate =
Self::start_check_duplicate_thread(exit, &blockstore, duplicate_receiver);
let t_check_duplicate = Self::start_check_duplicate_thread(
cluster_info.clone(),
exit.clone(),
blockstore.clone(),
duplicate_receiver,
);
let t_insert = Self::start_window_insert_thread(
exit,
@ -371,12 +377,11 @@ impl WindowService {
}
fn start_check_duplicate_thread(
exit: &Arc<AtomicBool>,
blockstore: &Arc<Blockstore>,
cluster_info: Arc<ClusterInfo>,
exit: Arc<AtomicBool>,
blockstore: Arc<Blockstore>,
duplicate_receiver: CrossbeamReceiver<Shred>,
) -> JoinHandle<()> {
let exit = exit.clone();
let blockstore = blockstore.clone();
let handle_error = || {
inc_new_counter_error!("solana-check-duplicate-error", 1, 1);
};
@ -388,7 +393,8 @@ impl WindowService {
}
let mut noop = || {};
if let Err(e) = run_check_duplicate(&blockstore, &duplicate_receiver) {
if let Err(e) = run_check_duplicate(&cluster_info, &blockstore, &duplicate_receiver)
{
if Self::should_exit_on_error(e, &mut noop, &handle_error) {
break;
}
@ -551,6 +557,7 @@ impl WindowService {
#[cfg(test)]
mod test {
use super::*;
use crate::contact_info::ContactInfo;
use solana_ledger::{
blockstore::{make_many_slot_entries, Blockstore},
entry::{create_ticks, Entry},
@ -563,6 +570,7 @@ mod test {
epoch_schedule::MINIMUM_SLOTS_PER_EPOCH,
hash::Hash,
signature::{Keypair, Signer},
timing::timestamp,
};
use std::sync::Arc;
@ -681,7 +689,10 @@ mod test {
let duplicate_shred_slot = duplicate_shred.slot();
sender.send(duplicate_shred).unwrap();
assert!(!blockstore.has_duplicate_shreds_in_slot(duplicate_shred_slot));
run_check_duplicate(&blockstore, &receiver).unwrap();
let keypair = Keypair::new();
let contact_info = ContactInfo::new_localhost(&keypair.pubkey(), timestamp());
let cluster_info = ClusterInfo::new(contact_info, Arc::new(keypair));
run_check_duplicate(&cluster_info, &blockstore, &receiver).unwrap();
assert!(blockstore.has_duplicate_shreds_in_slot(duplicate_shred_slot));
}
}