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

logs

Browse Source
This commit is contained in:
Anatoly Yakovenko
2018-05-24 22:59:15 +00:00
committed by Greg Fitzgerald
parent 115f4e54b8
commit c2c80232e3
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
multinode-demo/client.sh
View File

@ -4,4 +4,4 @@ cd /home/ubuntu/solana
export RUST_LOG=solana::crdt=trace export RUST_LOG=solana::crdt=trace
# scp ubuntu@18.206.1.146:~/solana/leader.json . # scp ubuntu@18.206.1.146:~/solana/leader.json .
# scp ubuntu@18.206.1.146:~/solana/mint-demo.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

3
src/bank.rs
View File

@ -161,7 +161,7 @@ impl Bank {
/// funds and isn't a duplicate. /// funds and isn't a duplicate.
pub fn process_verified_transaction_debits(&self, tr: &Transaction) -> Result<()> { pub fn process_verified_transaction_debits(&self, tr: &Transaction) -> Result<()> {
if let Instruction::NewContract(contract) = &tr.instruction { if let Instruction::NewContract(contract) = &tr.instruction {
info!("Transaction {}", contract.tokens); trace!("Transaction {}", contract.tokens);
} }
let bals = self.balances let bals = self.balances
.read() .read()
@ -243,6 +243,7 @@ impl Bank {
pub fn process_verified_transactions(&self, trs: Vec<Transaction>) -> Vec<Result<Transaction>> { pub fn process_verified_transactions(&self, trs: Vec<Transaction>) -> Vec<Result<Transaction>> {
// Run all debits first to filter out any transactions that can't be processed // Run all debits first to filter out any transactions that can't be processed
// in parallel deterministically. // in parallel deterministically.
info!("processing Transactions {}", trs.len());
let results: Vec<_> = trs.into_par_iter() let results: Vec<_> = trs.into_par_iter()
.map(|tr| self.process_verified_transaction_debits(&tr).map(|_| tr)) .map(|tr| self.process_verified_transaction_debits(&tr).map(|_| tr))
.collect(); // Calling collect() here forces all debits to complete before moving on. .collect(); // Calling collect() here forces all debits to complete before moving on.

5
src/bin/multinode-demo.rs
View File

@ -156,7 +156,7 @@ fn main() {
}); });
println!("Sampling tps every second...",); println!("Sampling tps every second...",);
for _ in 0..20 { for i in 0..100 {
let tx_count = client.transaction_count(); let tx_count = client.transaction_count();
duration = now.elapsed(); duration = now.elapsed();
now = Instant::now(); now = Instant::now();
@ -169,6 +169,9 @@ fn main() {
if txs == transactions.len() as u64 { if txs == transactions.len() as u64 {
break; break;
} }
if i > 20 && txs == 0 {
break;
}
sleep(Duration::new(1, 0)); sleep(Duration::new(1, 0));
} }
for val in validators { for val in validators {

1
src/streamer.rs
View File

@ -173,6 +173,7 @@ fn repair_window(
*times += 1; *times += 1;
//if times flips from all 1s 7 -> 8, 15 -> 16, we retry otherwise return Ok //if times flips from all 1s 7 -> 8, 15 -> 16, we retry otherwise return Ok
if *times & (*times - 1) != 0 { if *times & (*times - 1) != 0 {
trace!("repair_window counter {} {}", *times, *consumed);
return Ok(()); return Ok(());
} }
info!("repair_window request {} {}", *consumed, *received); info!("repair_window request {} {}", *consumed, *received);