Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Updates to dynamic-network-test to start validators in parallel #722

Closed
wants to merge 1 commit into from
Closed

Updates to dynamic-network-test to start validators in parallel #722

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 50 additions & 18 deletions tests/multinode.rs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use std::net::UdpSocket;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, RwLock};
use std::thread::sleep;
use std::thread::Builder;
use std::time::Duration;

fn converge(leader: &NodeInfo, num_nodes: usize) -> Vec<NodeInfo> {
Expand Down Expand Up @@ -389,28 +390,59 @@ fn test_multi_node_dynamic_network() {
send_tx_and_retry_get_balance(&leader_data, &alice, &bob_pubkey, Some(1000)).unwrap();
assert_eq!(leader_balance, 1000);

let validators: Vec<(NodeInfo, FullNode)> = (0..N)
let validators_per_thread = Arc::new(RwLock::new(Vec::new()));
let threads: Vec<_> = (0..10)
.into_iter()
.map(|n| {
let keypair = KeyPair::new();
let validator = TestNode::new_localhost_with_pubkey(keypair.pubkey());
let rd = validator.data.clone();
//send some tokens to the new validator
let bal =
send_tx_and_retry_get_balance(&leader_data, &alice, &keypair.pubkey(), Some(500));
assert_eq!(bal, Some(500));
let val = FullNode::new(
validator,
false,
LedgerFile::Path(ledger_path.clone()),
Some(keypair),
Some(leader_data.contact_info.ncp),
);
info!("started[{}/{}] {:x}", n, N, rd.debug_id());
(rd, val)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checkout into_par_iter
https://github.com/solana-labs/solana/blob/master/src/bin/client-demo.rs#L131

It’s part rayon

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aeyakovenko , that made it really simple.

.map(move |i| {
let validators_per_thread = validators_per_thread.clone();
let t = Builder::new()
.name("child".to_string())
.spawn(move || {
println!("Hello, world {}!", i);
let validators: Vec<(NodeInfo, FullNode)> = (0..N / 10)
.into_iter()
.map(|n| {
let keypair = KeyPair::new();
let validator = TestNode::new_localhost_with_pubkey(keypair.pubkey());
let rd = validator.data.clone();
//send some tokens to the new validator
let bal = send_tx_and_retry_get_balance(
Copy link
Member

@aeyakovenko aeyakovenko Jul 21, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would do this part first, before starting any validators, make sure their keys are valid and have a balance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean, transfer balance to all validators, before any of them is started?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, basically do all the prep work before any of them are started so start should be fast

&leader_data,
&alice,
&keypair.pubkey(),
Some(500),
);
assert_eq!(bal, Some(500));
let val = FullNode::new(
validator,
false,
LedgerFile::Path(ledger_path.clone()),
Some(keypair),
Some(leader_data.contact_info.ncp),
);
info!("started[{}/{}] {:x}", n, N, rd.debug_id());
(rd, val)
})
.collect();

validators_per_thread.write().unwrap().push(validators);
})
.unwrap();
t
})
.collect();

for t in threads {
t.join().unwrap();
}

let validators: Vec<(NodeInfo, FullNode)>;

for thread_vector in validators_per_thread.read().unwrap().iter() {
let mut validators: Vec<(NodeInfo, FullNode)>;
validators.extend(&thread_vector);
}

let mut consecutive_success = 0;
for i in 0..N {
//verify leader can do transfer
Expand Down