From 1022f1b0c6bc5019a1695665365966f3c4871da5 Mon Sep 17 00:00:00 2001 From: Anatoly Yakovenko Date: Thu, 24 May 2018 23:26:05 +0000 Subject: [PATCH] logs --- multinode-demo/leader.sh | 2 +- src/crdt.rs | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/multinode-demo/leader.sh b/multinode-demo/leader.sh index 45de6bf5b0..88a129fed0 100755 --- a/multinode-demo/leader.sh +++ b/multinode-demo/leader.sh @@ -1,6 +1,6 @@ #!/bin/bash cd /home/ubuntu/solana git pull -export RUST_LOG=solana::crdt=info +export RUST_LOG=solana=info cat genesis.log | cargo run --release --features cuda --bin solana-testnode -- -s leader.json -b 8000 -d | grep INFO #cat genesis.log | cargo run --release --bin solana-testnode -- -s leader.json -b 8000 -d diff --git a/src/crdt.rs b/src/crdt.rs index fef31b359f..653c251f95 100644 --- a/src/crdt.rs +++ b/src/crdt.rs @@ -176,7 +176,7 @@ impl Crdt { let (me, table): (ReplicatedData, Vec) = { // copy to avoid locking during IO let robj = obj.read().expect("'obj' read lock in pub fn broadcast"); - info!("broadcast table {}", robj.table.len()); + trace!("broadcast table {}", robj.table.len()); let cloned_table: Vec = robj.table.values().cloned().collect(); (robj.table[&robj.me].clone(), cloned_table) }; @@ -191,7 +191,7 @@ impl Crdt { //filter nodes that are not listening false } else { - info!("broadcast node {}", v.replicate_addr); + trace!("broadcast node {}", v.replicate_addr); true } }) @@ -200,8 +200,8 @@ impl Crdt { warn!("crdt too small"); return Err(Error::CrdtTooSmall); } - info!("nodes table {}", nodes.len()); - info!("blobs table {}", blobs.len()); + trace!("nodes table {}", nodes.len()); + trace!("blobs table {}", blobs.len()); // enumerate all the blobs, those are the indices // transmit them to nodes, starting from a different node let orders: Vec<_> = blobs @@ -214,7 +214,7 @@ impl Crdt { .skip((*transmit_index as usize) % nodes.len()), ) .collect(); - info!("orders table {}", orders.len()); + trace!("orders table {}", orders.len()); let errs: Vec<_> = orders .into_iter() .map(|((i, b), v)| { @@ -225,13 +225,13 @@ impl Crdt { blob.set_index(*transmit_index + i as u64) .expect("set_index in pub fn broadcast"); //TODO profile this, may need multiple sockets for par_iter - info!("broadcast {} to {}", blob.meta.size, v.replicate_addr); + trace!("broadcast {} to {}", blob.meta.size, v.replicate_addr); let e = s.send_to(&blob.data[..blob.meta.size], &v.replicate_addr); - info!("done broadcast {} to {}", blob.meta.size, v.replicate_addr); + trace!("done broadcast {} to {}", blob.meta.size, v.replicate_addr); e }) .collect(); - info!("broadcast results {}", errs.len()); + trace!("broadcast results {}", errs.len()); for e in errs { match e { Err(e) => { @@ -279,7 +279,7 @@ impl Crdt { let errs: Vec<_> = orders .par_iter() .map(|v| { - info!( + trace!( "retransmit blob {} to {}", rblob.get_index().unwrap(), v.replicate_addr @@ -478,7 +478,7 @@ impl Crdt { //TODO verify from is signed obj.write().unwrap().insert(&from); let me = obj.read().unwrap().my_data().clone(); - info!( + trace!( "received RequestWindowIndex {} {} myaddr {}", ix, from.replicate_addr, me.replicate_addr );