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

rename forwarder ports to tpu_via_blobs

This commit is contained in:
Carl 2019-03-11 12:46:30 -07:00 committed by Pankaj Garg
parent 0b8c5d807d
commit a4b6d181a2
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/banking_stage.rs
View File

@ -77,7 +77,7 @@ impl BankingStage {
fn forward_unprocessed_packets( fn forward_unprocessed_packets(
socket: &std::net::UdpSocket, socket: &std::net::UdpSocket,
forwarder: &std::net::SocketAddr, tpu_via_blobs: &std::net::SocketAddr,
unprocessed_packets: &[(SharedPackets, usize)], unprocessed_packets: &[(SharedPackets, usize)],
) -> std::io::Result<()> { ) -> std::io::Result<()> {
let locked_packets: Vec<_> = unprocessed_packets let locked_packets: Vec<_> = unprocessed_packets
@ -91,7 +91,7 @@ impl BankingStage {
let blobs = packet::packets_to_blobs(&packets); let blobs = packet::packets_to_blobs(&packets);
for blob in blobs { for blob in blobs {
socket.send_to(&blob.data[..blob.meta.size], forwarder)?; socket.send_to(&blob.data[..blob.meta.size], tpu_via_blobs)?;
} }
Ok(()) Ok(())
@ -118,7 +118,7 @@ impl BankingStage {
if forward { if forward {
let _ = Self::forward_unprocessed_packets( let _ = Self::forward_unprocessed_packets(
&socket, &socket,
&rcluster_info.leader_data().unwrap().forwarder, &rcluster_info.leader_data().unwrap().tpu_via_blobs,
&buffered_packets, &buffered_packets,
); );
} }
@ -173,7 +173,7 @@ impl BankingStage {
if let Some(leader) = cluster_info.read().unwrap().leader_data() { if let Some(leader) = cluster_info.read().unwrap().leader_data() {
let _ = Self::forward_unprocessed_packets( let _ = Self::forward_unprocessed_packets(
&socket, &socket,
&leader.forwarder, &leader.tpu_via_blobs,
&unprocessed_packets, &unprocessed_packets,
); );
} }

14
core/src/cluster_info.rs
View File

@ -1341,7 +1341,7 @@ pub struct Sockets {
pub gossip: UdpSocket, pub gossip: UdpSocket,
pub tvu: Vec<UdpSocket>, pub tvu: Vec<UdpSocket>,
pub tpu: Vec<UdpSocket>, pub tpu: Vec<UdpSocket>,
pub forwarder: Vec<UdpSocket>, pub tpu_via_blobs: Vec<UdpSocket>,
pub broadcast: UdpSocket, pub broadcast: UdpSocket,
pub repair: UdpSocket, pub repair: UdpSocket,
pub retransmit: UdpSocket, pub retransmit: UdpSocket,
@ -1362,7 +1362,7 @@ impl Node {
let tpu = UdpSocket::bind("127.0.0.1:0").unwrap(); let tpu = UdpSocket::bind("127.0.0.1:0").unwrap();
let gossip = UdpSocket::bind("127.0.0.1:0").unwrap(); let gossip = UdpSocket::bind("127.0.0.1:0").unwrap();
let tvu = UdpSocket::bind("127.0.0.1:0").unwrap(); let tvu = UdpSocket::bind("127.0.0.1:0").unwrap();
let forwarder = UdpSocket::bind("127.0.0.1:0").unwrap(); let tpu_via_blobs = UdpSocket::bind("127.0.0.1:0").unwrap();
let repair = UdpSocket::bind("127.0.0.1:0").unwrap(); let repair = UdpSocket::bind("127.0.0.1:0").unwrap();
let rpc_port = find_available_port_in_range((1024, 65535)).unwrap(); let rpc_port = find_available_port_in_range((1024, 65535)).unwrap();
let rpc_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), rpc_port); let rpc_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), rpc_port);
@ -1378,7 +1378,7 @@ impl Node {
gossip.local_addr().unwrap(), gossip.local_addr().unwrap(),
tvu.local_addr().unwrap(), tvu.local_addr().unwrap(),
tpu.local_addr().unwrap(), tpu.local_addr().unwrap(),
forwarder.local_addr().unwrap(), tpu_via_blobs.local_addr().unwrap(),
storage.local_addr().unwrap(), storage.local_addr().unwrap(),
rpc_addr, rpc_addr,
rpc_pubsub_addr, rpc_pubsub_addr,
@ -1390,7 +1390,7 @@ impl Node {
gossip, gossip,
tvu: vec![tvu], tvu: vec![tvu],
tpu: vec![tpu], tpu: vec![tpu],
forwarder: vec![forwarder], tpu_via_blobs: vec![tpu_via_blobs],
broadcast, broadcast,
repair, repair,
retransmit, retransmit,
@ -1419,7 +1419,7 @@ impl Node {
let (tpu_port, tpu_sockets) = let (tpu_port, tpu_sockets) =
multi_bind_in_range(FULLNODE_PORT_RANGE, 32).expect("tpu multi_bind"); multi_bind_in_range(FULLNODE_PORT_RANGE, 32).expect("tpu multi_bind");
let (forwarder_port, forwarder_sockets) = let (tpu_via_blobs_port, tpu_via_blobs_sockets) =
multi_bind_in_range(FULLNODE_PORT_RANGE, 8).expect("tpu multi_bind"); multi_bind_in_range(FULLNODE_PORT_RANGE, 8).expect("tpu multi_bind");
let (_, repair) = bind(); let (_, repair) = bind();
@ -1432,7 +1432,7 @@ impl Node {
SocketAddr::new(gossip_addr.ip(), gossip_port), SocketAddr::new(gossip_addr.ip(), gossip_port),
SocketAddr::new(gossip_addr.ip(), tvu_port), SocketAddr::new(gossip_addr.ip(), tvu_port),
SocketAddr::new(gossip_addr.ip(), tpu_port), SocketAddr::new(gossip_addr.ip(), tpu_port),
SocketAddr::new(gossip_addr.ip(), forwarder_port), SocketAddr::new(gossip_addr.ip(), tpu_via_blobs_port),
SocketAddr::new(gossip_addr.ip(), storage_port), SocketAddr::new(gossip_addr.ip(), storage_port),
SocketAddr::new(gossip_addr.ip(), RPC_PORT), SocketAddr::new(gossip_addr.ip(), RPC_PORT),
SocketAddr::new(gossip_addr.ip(), RPC_PORT + 1), SocketAddr::new(gossip_addr.ip(), RPC_PORT + 1),
@ -1446,7 +1446,7 @@ impl Node {
gossip, gossip,
tvu: tvu_sockets, tvu: tvu_sockets,
tpu: tpu_sockets, tpu: tpu_sockets,
forwarder: forwarder_sockets, tpu_via_blobs: tpu_via_blobs_sockets,
broadcast, broadcast,
repair, repair,
retransmit, retransmit,

24
core/src/contact_info.rs
View File

@ -18,8 +18,8 @@ pub struct ContactInfo {
pub tvu: SocketAddr, pub tvu: SocketAddr,
/// transactions address /// transactions address
pub tpu: SocketAddr, pub tpu: SocketAddr,
// forwarder address /// address to forward unprocessed transactions to
pub forwarder: SocketAddr, pub tpu_via_blobs: SocketAddr,
/// storage data address /// storage data address
pub storage_addr: SocketAddr, pub storage_addr: SocketAddr,
/// address to which to send JSON-RPC requests /// address to which to send JSON-RPC requests
@ -74,7 +74,7 @@ impl Default for ContactInfo {
gossip: socketaddr_any!(), gossip: socketaddr_any!(),
tvu: socketaddr_any!(), tvu: socketaddr_any!(),
tpu: socketaddr_any!(), tpu: socketaddr_any!(),
forwarder: socketaddr_any!(), tpu_via_blobs: socketaddr_any!(),
storage_addr: socketaddr_any!(), storage_addr: socketaddr_any!(),
rpc: socketaddr_any!(), rpc: socketaddr_any!(),
rpc_pubsub: socketaddr_any!(), rpc_pubsub: socketaddr_any!(),
@ -90,7 +90,7 @@ impl ContactInfo {
gossip: SocketAddr, gossip: SocketAddr,
tvu: SocketAddr, tvu: SocketAddr,
tpu: SocketAddr, tpu: SocketAddr,
forwarder: SocketAddr, tpu_via_blobs: SocketAddr,
storage_addr: SocketAddr, storage_addr: SocketAddr,
rpc: SocketAddr, rpc: SocketAddr,
rpc_pubsub: SocketAddr, rpc_pubsub: SocketAddr,
@ -102,7 +102,7 @@ impl ContactInfo {
gossip, gossip,
tvu, tvu,
tpu, tpu,
forwarder, tpu_via_blobs,
storage_addr, storage_addr,
rpc, rpc,
rpc_pubsub, rpc_pubsub,
@ -150,7 +150,7 @@ impl ContactInfo {
let tpu_addr = *bind_addr; let tpu_addr = *bind_addr;
let gossip_addr = Self::next_port(&bind_addr, 1); let gossip_addr = Self::next_port(&bind_addr, 1);
let tvu_addr = Self::next_port(&bind_addr, 2); let tvu_addr = Self::next_port(&bind_addr, 2);
let forwarder_addr = Self::next_port(&bind_addr, 3); let tpu_via_blobs_addr = Self::next_port(&bind_addr, 3);
let rpc_addr = SocketAddr::new(bind_addr.ip(), RPC_PORT); let rpc_addr = SocketAddr::new(bind_addr.ip(), RPC_PORT);
let rpc_pubsub_addr = SocketAddr::new(bind_addr.ip(), RPC_PORT + 1); let rpc_pubsub_addr = SocketAddr::new(bind_addr.ip(), RPC_PORT + 1);
Self::new( Self::new(
@ -158,7 +158,7 @@ impl ContactInfo {
gossip_addr, gossip_addr,
tvu_addr, tvu_addr,
tpu_addr, tpu_addr,
forwarder_addr, tpu_via_blobs_addr,
"0.0.0.0:0".parse().unwrap(), "0.0.0.0:0".parse().unwrap(),
rpc_addr, rpc_addr,
rpc_pubsub_addr, rpc_pubsub_addr,
@ -261,7 +261,7 @@ mod tests {
let ci = ContactInfo::default(); let ci = ContactInfo::default();
assert!(ci.gossip.ip().is_unspecified()); assert!(ci.gossip.ip().is_unspecified());
assert!(ci.tvu.ip().is_unspecified()); assert!(ci.tvu.ip().is_unspecified());
assert!(ci.forwarder.ip().is_unspecified()); assert!(ci.tpu_via_blobs.ip().is_unspecified());
assert!(ci.rpc.ip().is_unspecified()); assert!(ci.rpc.ip().is_unspecified());
assert!(ci.rpc_pubsub.ip().is_unspecified()); assert!(ci.rpc_pubsub.ip().is_unspecified());
assert!(ci.tpu.ip().is_unspecified()); assert!(ci.tpu.ip().is_unspecified());
@ -272,7 +272,7 @@ mod tests {
let ci = ContactInfo::new_multicast(); let ci = ContactInfo::new_multicast();
assert!(ci.gossip.ip().is_multicast()); assert!(ci.gossip.ip().is_multicast());
assert!(ci.tvu.ip().is_multicast()); assert!(ci.tvu.ip().is_multicast());
assert!(ci.forwarder.ip().is_multicast()); assert!(ci.tpu_via_blobs.ip().is_multicast());
assert!(ci.rpc.ip().is_multicast()); assert!(ci.rpc.ip().is_multicast());
assert!(ci.rpc_pubsub.ip().is_multicast()); assert!(ci.rpc_pubsub.ip().is_multicast());
assert!(ci.tpu.ip().is_multicast()); assert!(ci.tpu.ip().is_multicast());
@ -284,7 +284,7 @@ mod tests {
let ci = ContactInfo::new_gossip_entry_point(&addr); let ci = ContactInfo::new_gossip_entry_point(&addr);
assert_eq!(ci.gossip, addr); assert_eq!(ci.gossip, addr);
assert!(ci.tvu.ip().is_unspecified()); assert!(ci.tvu.ip().is_unspecified());
assert!(ci.forwarder.ip().is_unspecified()); assert!(ci.tpu_via_blobs.ip().is_unspecified());
assert!(ci.rpc.ip().is_unspecified()); assert!(ci.rpc.ip().is_unspecified());
assert!(ci.rpc_pubsub.ip().is_unspecified()); assert!(ci.rpc_pubsub.ip().is_unspecified());
assert!(ci.tpu.ip().is_unspecified()); assert!(ci.tpu.ip().is_unspecified());
@ -297,7 +297,7 @@ mod tests {
assert_eq!(ci.tpu, addr); assert_eq!(ci.tpu, addr);
assert_eq!(ci.gossip.port(), 11); assert_eq!(ci.gossip.port(), 11);
assert_eq!(ci.tvu.port(), 12); assert_eq!(ci.tvu.port(), 12);
assert_eq!(ci.forwarder.port(), 13); assert_eq!(ci.tpu_via_blobs.port(), 13);
assert_eq!(ci.rpc.port(), 8899); assert_eq!(ci.rpc.port(), 8899);
assert_eq!(ci.rpc_pubsub.port(), 8900); assert_eq!(ci.rpc_pubsub.port(), 8900);
assert!(ci.storage_addr.ip().is_unspecified()); assert!(ci.storage_addr.ip().is_unspecified());
@ -312,7 +312,7 @@ mod tests {
assert_eq!(d1.id, keypair.pubkey()); assert_eq!(d1.id, keypair.pubkey());
assert_eq!(d1.gossip, socketaddr!("127.0.0.1:1235")); assert_eq!(d1.gossip, socketaddr!("127.0.0.1:1235"));
assert_eq!(d1.tvu, socketaddr!("127.0.0.1:1236")); assert_eq!(d1.tvu, socketaddr!("127.0.0.1:1236"));
assert_eq!(d1.forwarder, socketaddr!("127.0.0.1:1237")); assert_eq!(d1.tpu_via_blobs, socketaddr!("127.0.0.1:1237"));
assert_eq!(d1.tpu, socketaddr!("127.0.0.1:1234")); assert_eq!(d1.tpu, socketaddr!("127.0.0.1:1234"));
assert_eq!(d1.rpc, socketaddr!("127.0.0.1:8899")); assert_eq!(d1.rpc, socketaddr!("127.0.0.1:8899"));
assert_eq!(d1.rpc_pubsub, socketaddr!("127.0.0.1:8900")); assert_eq!(d1.rpc_pubsub, socketaddr!("127.0.0.1:8900"));

16
core/src/fetch_stage.rs
View File

@ -16,29 +16,29 @@ impl FetchStage {
#[allow(clippy::new_ret_no_self)] #[allow(clippy::new_ret_no_self)]
pub fn new( pub fn new(
sockets: Vec<UdpSocket>, sockets: Vec<UdpSocket>,
forwarder_sockets: Vec<UdpSocket>, tpu_via_blobs_sockets: Vec<UdpSocket>,
exit: &Arc<AtomicBool>, exit: &Arc<AtomicBool>,
) -> (Self, PacketReceiver) { ) -> (Self, PacketReceiver) {
let (sender, receiver) = channel(); let (sender, receiver) = channel();
( (
Self::new_with_sender(sockets, forwarder_sockets, exit, &sender), Self::new_with_sender(sockets, tpu_via_blobs_sockets, exit, &sender),
receiver, receiver,
) )
} }
pub fn new_with_sender( pub fn new_with_sender(
sockets: Vec<UdpSocket>, sockets: Vec<UdpSocket>,
forwarder_sockets: Vec<UdpSocket>, tpu_via_blobs_sockets: Vec<UdpSocket>,
exit: &Arc<AtomicBool>, exit: &Arc<AtomicBool>,
sender: &PacketSender, sender: &PacketSender,
) -> Self { ) -> Self {
let tx_sockets = sockets.into_iter().map(Arc::new).collect(); let tx_sockets = sockets.into_iter().map(Arc::new).collect();
let forwarder_sockets = forwarder_sockets.into_iter().map(Arc::new).collect(); let tpu_via_blobs_sockets = tpu_via_blobs_sockets.into_iter().map(Arc::new).collect();
Self::new_multi_socket(tx_sockets, forwarder_sockets, exit, &sender) Self::new_multi_socket(tx_sockets, tpu_via_blobs_sockets, exit, &sender)
} }
fn new_multi_socket( fn new_multi_socket(
sockets: Vec<Arc<UdpSocket>>, sockets: Vec<Arc<UdpSocket>>,
forwarder_sockets: Vec<Arc<UdpSocket>>, tpu_via_blobs_sockets: Vec<Arc<UdpSocket>>,
exit: &Arc<AtomicBool>, exit: &Arc<AtomicBool>,
sender: &PacketSender, sender: &PacketSender,
) -> Self { ) -> Self {
@ -46,11 +46,11 @@ impl FetchStage {
.into_iter() .into_iter()
.map(|socket| streamer::receiver(socket, &exit, sender.clone(), "fetch-stage")); .map(|socket| streamer::receiver(socket, &exit, sender.clone(), "fetch-stage"));
let forwarder_threads = forwarder_sockets let tpu_via_blobs_threads = tpu_via_blobs_sockets
.into_iter() .into_iter()
.map(|socket| streamer::blob_packet_receiver(socket, &exit, sender.clone())); .map(|socket| streamer::blob_packet_receiver(socket, &exit, sender.clone()));
let thread_hdls: Vec<_> = tpu_threads.chain(forwarder_threads).collect(); let thread_hdls: Vec<_> = tpu_threads.chain(tpu_via_blobs_threads).collect();
Self { thread_hdls } Self { thread_hdls }
} }
} }

2
core/src/fullnode.rs
View File

@ -220,7 +220,7 @@ impl Fullnode {
&poh_recorder, &poh_recorder,
entry_receiver, entry_receiver,
node.sockets.tpu, node.sockets.tpu,
node.sockets.forwarder, node.sockets.tpu_via_blobs,
node.sockets.broadcast, node.sockets.broadcast,
config.sigverify_disabled, config.sigverify_disabled,
&blocktree, &blocktree,

4
core/src/tpu.rs
View File

@ -33,7 +33,7 @@ impl Tpu {
poh_recorder: &Arc<Mutex<PohRecorder>>, poh_recorder: &Arc<Mutex<PohRecorder>>,
entry_receiver: Receiver<WorkingBankEntries>, entry_receiver: Receiver<WorkingBankEntries>,
transactions_sockets: Vec<UdpSocket>, transactions_sockets: Vec<UdpSocket>,
forwarder_sockets: Vec<UdpSocket>, tpu_via_blobs_sockets: Vec<UdpSocket>,
broadcast_socket: UdpSocket, broadcast_socket: UdpSocket,
sigverify_disabled: bool, sigverify_disabled: bool,
blocktree: &Arc<Blocktree>, blocktree: &Arc<Blocktree>,
@ -44,7 +44,7 @@ impl Tpu {
let (packet_sender, packet_receiver) = channel(); let (packet_sender, packet_receiver) = channel();
let fetch_stage = FetchStage::new_with_sender( let fetch_stage = FetchStage::new_with_sender(
transactions_sockets, transactions_sockets,
forwarder_sockets, tpu_via_blobs_sockets,
&exit, &exit,
&packet_sender.clone(), &packet_sender.clone(),
); );