diff --git a/multinode-demo/client.sh b/multinode-demo/client.sh index e430316ba..99bf40498 100755 --- a/multinode-demo/client.sh +++ b/multinode-demo/client.sh @@ -4,4 +4,4 @@ cd /home/ubuntu/solana export RUST_LOG=solana::crdt=trace # scp ubuntu@18.206.1.146:~/solana/leader.json . # scp ubuntu@18.206.1.146:~/solana/mint-demo.json . -cat mint-demo.json | cargo run --release --bin solana-multinode-demo -- -l leader.json -c 10.0.5.51:8100 -n 1 +cat mint-demo.json | cargo run --release --bin solana-multinode-demo -- -l leader.json -c 10.0.5.179:8100 -n 1 diff --git a/src/bank.rs b/src/bank.rs index 454b214fd..99cafa0b6 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -161,7 +161,7 @@ impl Bank { /// funds and isn't a duplicate. pub fn process_verified_transaction_debits(&self, tr: &Transaction) -> Result<()> { if let Instruction::NewContract(contract) = &tr.instruction { - info!("Transaction {}", contract.tokens); + trace!("Transaction {}", contract.tokens); } let bals = self.balances .read() @@ -243,6 +243,7 @@ impl Bank { pub fn process_verified_transactions(&self, trs: Vec) -> Vec> { // Run all debits first to filter out any transactions that can't be processed // in parallel deterministically. + info!("processing Transactions {}", trs.len()); let results: Vec<_> = trs.into_par_iter() .map(|tr| self.process_verified_transaction_debits(&tr).map(|_| tr)) .collect(); // Calling collect() here forces all debits to complete before moving on. diff --git a/src/bin/multinode-demo.rs b/src/bin/multinode-demo.rs index 6a4032957..05634895d 100644 --- a/src/bin/multinode-demo.rs +++ b/src/bin/multinode-demo.rs @@ -156,7 +156,7 @@ fn main() { }); println!("Sampling tps every second...",); - for _ in 0..20 { + for i in 0..100 { let tx_count = client.transaction_count(); duration = now.elapsed(); now = Instant::now(); @@ -169,6 +169,9 @@ fn main() { if txs == transactions.len() as u64 { break; } + if i > 20 && txs == 0 { + break; + } sleep(Duration::new(1, 0)); } for val in validators { diff --git a/src/streamer.rs b/src/streamer.rs index f2fbcef4c..1e88f1dc2 100644 --- a/src/streamer.rs +++ b/src/streamer.rs @@ -173,6 +173,7 @@ fn repair_window( *times += 1; //if times flips from all 1s 7 -> 8, 15 -> 16, we retry otherwise return Ok if *times & (*times - 1) != 0 { + trace!("repair_window counter {} {}", *times, *consumed); return Ok(()); } info!("repair_window request {} {}", *consumed, *received);