From 1c17ea3b14b06938b1dccfef22ea33f2d7eb2d4a Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Fri, 11 Sep 2015 18:17:19 -0700
Subject: [PATCH] blockchain parameter && log tweaks

---
 blockchain/pool.go          | 6 ++++--
 blockchain/reactor.go       | 2 +-
 p2p/connection.go           | 2 +-
 p2p/peer.go                 | 4 ++--
 scripts/unsafe_reset_net.sh | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/blockchain/pool.go b/blockchain/pool.go
index a01b2e230..b03c236be 100644
--- a/blockchain/pool.go
+++ b/blockchain/pool.go
@@ -14,8 +14,8 @@ const (
 	requestIntervalMS         = 500
 	maxTotalRequests          = 300
 	maxPendingRequests        = maxTotalRequests
-	maxPendingRequestsPerPeer = 30
-	peerTimeoutSeconds        = 10
+	maxPendingRequestsPerPeer = 50
+	peerTimeoutSeconds        = 15
 	minRecvRate               = 10240 // 10Kb/s
 )
 
@@ -103,6 +103,7 @@ func (pool *BlockPool) removeTimedoutPeers() {
 			// XXX remove curRate != 0
 			if curRate != 0 && curRate < minRecvRate {
 				pool.sendTimeout(peer.id)
+				log.Warn("SendTimeout", "peer", peer.id, "reason", "curRate too low")
 				peer.didTimeout = true
 			}
 		}
@@ -363,6 +364,7 @@ func (bpp *bpPeer) decrPending(recvSize int) {
 
 func (bpp *bpPeer) onTimeout() {
 	bpp.pool.sendTimeout(bpp.id)
+	log.Warn("SendTimeout", "peer", bpp.id, "reason", "onTimeout")
 	bpp.didTimeout = true
 }
 
diff --git a/blockchain/reactor.go b/blockchain/reactor.go
index 26d4ebabc..b80438a72 100644
--- a/blockchain/reactor.go
+++ b/blockchain/reactor.go
@@ -124,7 +124,7 @@ func (bcR *BlockchainReactor) Receive(chID byte, src *p2p.Peer, msgBytes []byte)
 		return
 	}
 
-	log.Notice("Received message", "msg", msg)
+	log.Notice("Received message", "src", src, "chID", chID, "msg", msg)
 
 	switch msg := msg.(type) {
 	case *bcBlockRequestMessage:
diff --git a/p2p/connection.go b/p2p/connection.go
index 90fafe894..a9060467b 100644
--- a/p2p/connection.go
+++ b/p2p/connection.go
@@ -585,7 +585,7 @@ func (ch *Channel) writeMsgPacketTo(w io.Writer) (n int64, err error) {
 // Handles incoming msgPackets. Returns a msg bytes if msg is complete.
 // Not goroutine-safe
 func (ch *Channel) recvMsgPacket(packet msgPacket) ([]byte, error) {
-	log.Debug("Read Msg Packet", "conn", ch.conn, "packet", packet)
+	// log.Debug("Read Msg Packet", "conn", ch.conn, "packet", packet)
 	if wire.MaxBinaryReadSize < len(ch.recving)+len(packet.Bytes) {
 		return nil, wire.ErrBinaryReadSizeOverflow
 	}
diff --git a/p2p/peer.go b/p2p/peer.go
index fc87365ae..a03f8713b 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -119,9 +119,9 @@ func (p *Peer) WriteTo(w io.Writer) (n int64, err error) {
 
 func (p *Peer) String() string {
 	if p.outbound {
-		return fmt.Sprintf("Peer{%v out}", p.Key)
+		return fmt.Sprintf("Peer{%v %v out}", p.mconn, p.Key[:12])
 	} else {
-		return fmt.Sprintf("Peer{%v in}", p.Key)
+		return fmt.Sprintf("Peer{%v %v in}", p.mconn, p.Key[:12])
 	}
 }
 
diff --git a/scripts/unsafe_reset_net.sh b/scripts/unsafe_reset_net.sh
index c3d2aba93..c6767427d 100755
--- a/scripts/unsafe_reset_net.sh
+++ b/scripts/unsafe_reset_net.sh
@@ -3,7 +3,7 @@ set -euo pipefail
 IFS=$'\n\t'
 
 debora run -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; killall tendermint; killall logjack"
-debora run -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; tendermint unsafe_reset_priv_validator; rm -rf ~/.tendermint/data; rm ~/.tendermint/genesis.json"
+debora run -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; tendermint unsafe_reset_priv_validator; rm -rf ~/.tendermint/data; rm ~/.tendermint/genesis.json; rm ~/.tendermint/logs/*"
 debora run -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; git pull origin develop; make"
 debora run -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; mkdir -p ~/.tendermint/logs"
 debora run --bg --label tendermint -- bash -c "cd \$GOPATH/src/github.com/tendermint/tendermint; tendermint node 2>&1 | stdinwriter -outpath ~/.tendermint/logs/tendermint.log"