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

Do not forward vote transactions (#3871)

Browse Source
This commit is contained in:
Pankaj Garg
2019-04-18 11:18:49 -07:00
committed by GitHub
parent 6a878602f2
commit f2187780d2
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/banking_stage.rs
View File

@ -84,10 +84,11 @@ impl BankingStage {
// Many banks that process transactions in parallel. // Many banks that process transactions in parallel.
let bank_thread_hdls: Vec<JoinHandle<()>> = (0..num_threads) let bank_thread_hdls: Vec<JoinHandle<()>> = (0..num_threads)
.map(|i| { .map(|i| {
let verified_receiver = if i < num_threads - 1 { let (verified_receiver, enable_forwarding) = if i < num_threads - 1 {
verified_receiver.clone() (verified_receiver.clone(), true)
} else { } else {
verified_vote_receiver.clone() // Disable forwarding of vote transactions, as votes are gossiped
(verified_vote_receiver.clone(), false)
}; };
let poh_recorder = poh_recorder.clone(); let poh_recorder = poh_recorder.clone();
@ -102,6 +103,7 @@ impl BankingStage {
&poh_recorder, &poh_recorder,
&cluster_info, &cluster_info,
&mut recv_start, &mut recv_start,
enable_forwarding,
); );
exit.store(true, Ordering::Relaxed); exit.store(true, Ordering::Relaxed);
}) })
@ -205,6 +207,7 @@ impl BankingStage {
poh_recorder: &Arc<Mutex<PohRecorder>>, poh_recorder: &Arc<Mutex<PohRecorder>>,
cluster_info: &Arc<RwLock<ClusterInfo>>, cluster_info: &Arc<RwLock<ClusterInfo>>,
buffered_packets: &[(Packets, usize, Vec<u8>)], buffered_packets: &[(Packets, usize, Vec<u8>)],
enable_forwarding: bool,
) -> Result<UnprocessedPackets> { ) -> Result<UnprocessedPackets> {
let rcluster_info = cluster_info.read().unwrap(); let rcluster_info = cluster_info.read().unwrap();
@ -219,11 +222,13 @@ impl BankingStage {
Self::process_buffered_packets(poh_recorder, buffered_packets) Self::process_buffered_packets(poh_recorder, buffered_packets)
} }
BufferedPacketsDecision::Forward => { BufferedPacketsDecision::Forward => {
let _ = Self::forward_unprocessed_packets( if enable_forwarding {
&socket, let _ = Self::forward_unprocessed_packets(
&rcluster_info.leader_data().unwrap().tpu_via_blobs, &socket,
&buffered_packets, &rcluster_info.leader_data().unwrap().tpu_via_blobs,
); &buffered_packets,
);
}
Ok(vec![]) Ok(vec![])
} }
_ => Ok(buffered_packets.to_vec()), _ => Ok(buffered_packets.to_vec()),
@ -256,6 +261,7 @@ impl BankingStage {
poh_recorder: &Arc<Mutex<PohRecorder>>, poh_recorder: &Arc<Mutex<PohRecorder>>,
cluster_info: &Arc<RwLock<ClusterInfo>>, cluster_info: &Arc<RwLock<ClusterInfo>>,
recv_start: &mut Instant, recv_start: &mut Instant,
enable_forwarding: bool,
) { ) {
let socket = UdpSocket::bind("0.0.0.0:0").unwrap(); let socket = UdpSocket::bind("0.0.0.0:0").unwrap();
let mut buffered_packets = vec![]; let mut buffered_packets = vec![];
@ -266,6 +272,7 @@ impl BankingStage {
poh_recorder, poh_recorder,
cluster_info, cluster_info,
&buffered_packets, &buffered_packets,
enable_forwarding,
) )
.map(|packets| buffered_packets = packets) .map(|packets| buffered_packets = packets)
.unwrap_or_else(|_| buffered_packets.clear()); .unwrap_or_else(|_| buffered_packets.clear());
@ -295,12 +302,14 @@ impl BankingStage {
continue; continue;
} }
if let Some(leader) = cluster_info.read().unwrap().leader_data() { if enable_forwarding {
let _ = Self::forward_unprocessed_packets( if let Some(leader) = cluster_info.read().unwrap().leader_data() {
&socket, let _ = Self::forward_unprocessed_packets(
&leader.tpu_via_blobs, &socket,
&unprocessed_packets, &leader.tpu_via_blobs,
); &unprocessed_packets,
);
}
} }
} }
Err(err) => { Err(err) => {