bench-tps no longer cares who the leader is
This commit is contained in:
parent
e04148ff44
commit
8f0aa956a3
|
@ -179,9 +179,9 @@ pub fn generate_txs(
|
||||||
dest: &[Keypair],
|
dest: &[Keypair],
|
||||||
threads: usize,
|
threads: usize,
|
||||||
reclaim: bool,
|
reclaim: bool,
|
||||||
leader: &NodeInfo,
|
node_info: &NodeInfo,
|
||||||
) {
|
) {
|
||||||
let mut client = mk_client(leader);
|
let mut client = mk_client(node_info);
|
||||||
let blockhash = client.get_recent_blockhash();
|
let blockhash = client.get_recent_blockhash();
|
||||||
let tx_count = source.len();
|
let tx_count = source.len();
|
||||||
println!("Signing transactions... {} (reclaim={})", tx_count, reclaim);
|
println!("Signing transactions... {} (reclaim={})", tx_count, reclaim);
|
||||||
|
@ -236,12 +236,12 @@ pub fn generate_txs(
|
||||||
pub fn do_tx_transfers(
|
pub fn do_tx_transfers(
|
||||||
exit_signal: &Arc<AtomicBool>,
|
exit_signal: &Arc<AtomicBool>,
|
||||||
shared_txs: &SharedTransactions,
|
shared_txs: &SharedTransactions,
|
||||||
leader: &NodeInfo,
|
node_info: &NodeInfo,
|
||||||
shared_tx_thread_count: &Arc<AtomicIsize>,
|
shared_tx_thread_count: &Arc<AtomicIsize>,
|
||||||
total_tx_sent_count: &Arc<AtomicUsize>,
|
total_tx_sent_count: &Arc<AtomicUsize>,
|
||||||
thread_batch_sleep_ms: usize,
|
thread_batch_sleep_ms: usize,
|
||||||
) {
|
) {
|
||||||
let client = mk_client(&leader);
|
let client = mk_client(&node_info);
|
||||||
loop {
|
loop {
|
||||||
if thread_batch_sleep_ms > 0 {
|
if thread_batch_sleep_ms > 0 {
|
||||||
sleep(Duration::from_millis(thread_batch_sleep_ms as u64));
|
sleep(Duration::from_millis(thread_batch_sleep_ms as u64));
|
||||||
|
@ -256,7 +256,7 @@ pub fn do_tx_transfers(
|
||||||
println!(
|
println!(
|
||||||
"Transferring 1 unit {} times... to {}",
|
"Transferring 1 unit {} times... to {}",
|
||||||
txs0.len(),
|
txs0.len(),
|
||||||
leader.tpu
|
node_info.tpu
|
||||||
);
|
);
|
||||||
let tx_len = txs0.len();
|
let tx_len = txs0.len();
|
||||||
let transfer_start = Instant::now();
|
let transfer_start = Instant::now();
|
||||||
|
|
|
@ -40,7 +40,7 @@ fn main() {
|
||||||
} = cfg;
|
} = cfg;
|
||||||
|
|
||||||
let cluster_entrypoint = ContactInfo::new_entry_point(&network);
|
let cluster_entrypoint = ContactInfo::new_entry_point(&network);
|
||||||
let (leader, nodes) = discover(&cluster_entrypoint, num_nodes).unwrap_or_else(|err| {
|
let (_leader, nodes) = discover(&cluster_entrypoint, num_nodes).unwrap_or_else(|err| {
|
||||||
eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
|
eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
|
||||||
exit(1);
|
exit(1);
|
||||||
});
|
});
|
||||||
|
@ -59,18 +59,12 @@ fn main() {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if leader.is_none() {
|
|
||||||
eprintln!("Error: No leader");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if converge_only {
|
if converge_only {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let leader = leader.unwrap();
|
let mut client = mk_client(&cluster_entrypoint);
|
||||||
let mut client = mk_client(&leader);
|
let mut barrier_client = mk_client(&cluster_entrypoint);
|
||||||
let mut barrier_client = mk_client(&leader);
|
|
||||||
|
|
||||||
let mut seed = [0u8; 32];
|
let mut seed = [0u8; 32];
|
||||||
seed.copy_from_slice(&id.public_key_bytes()[..32]);
|
seed.copy_from_slice(&id.public_key_bytes()[..32]);
|
||||||
|
@ -144,7 +138,7 @@ fn main() {
|
||||||
.map(|_| {
|
.map(|_| {
|
||||||
let exit_signal = exit_signal.clone();
|
let exit_signal = exit_signal.clone();
|
||||||
let shared_txs = shared_txs.clone();
|
let shared_txs = shared_txs.clone();
|
||||||
let leader = leader.clone();
|
let cluster_entrypoint = cluster_entrypoint.clone();
|
||||||
let shared_tx_active_thread_count = shared_tx_active_thread_count.clone();
|
let shared_tx_active_thread_count = shared_tx_active_thread_count.clone();
|
||||||
let total_tx_sent_count = total_tx_sent_count.clone();
|
let total_tx_sent_count = total_tx_sent_count.clone();
|
||||||
Builder::new()
|
Builder::new()
|
||||||
|
@ -153,7 +147,7 @@ fn main() {
|
||||||
do_tx_transfers(
|
do_tx_transfers(
|
||||||
&exit_signal,
|
&exit_signal,
|
||||||
&shared_txs,
|
&shared_txs,
|
||||||
&leader,
|
&cluster_entrypoint,
|
||||||
&shared_tx_active_thread_count,
|
&shared_tx_active_thread_count,
|
||||||
&total_tx_sent_count,
|
&total_tx_sent_count,
|
||||||
thread_batch_sleep_ms,
|
thread_batch_sleep_ms,
|
||||||
|
@ -181,7 +175,7 @@ fn main() {
|
||||||
&keypairs[len..],
|
&keypairs[len..],
|
||||||
threads,
|
threads,
|
||||||
reclaim_lamports_back_to_source_account,
|
reclaim_lamports_back_to_source_account,
|
||||||
&leader,
|
&cluster_entrypoint,
|
||||||
);
|
);
|
||||||
// In sustained mode overlap the transfers with generation
|
// In sustained mode overlap the transfers with generation
|
||||||
// this has higher average performance but lower peak performance
|
// this has higher average performance but lower peak performance
|
||||||
|
|
Loading…
Reference in New Issue