Browse Source

adding more debug logs

pull/67/head
Jae Kwon 10 years ago
parent
commit
cfb4a40855
4 changed files with 30 additions and 8 deletions
  1. +1
    -0
      .gitignore
  2. +1
    -1
      config/config.go
  3. +20
    -1
      consensus/reactor.go
  4. +8
    -6
      p2p/connection.go

+ 1
- 0
.gitignore View File

@ -7,3 +7,4 @@ build/*
rpc/test/.tendermint
.debora
.tendermint
remote_dump

+ 1
- 1
config/config.go View File

@ -36,7 +36,7 @@ var defaultConfig = `# This is a TOML config file.
# For more information, see https://github.com/toml-lang/toml
Moniker = "anonymous"
Network = "tendermint_testnet4.1"
Network = "tendermint_testnet4.2"
ListenAddr = "0.0.0.0:46656"
# First node to connect to. Command-line overridable.
SeedNode = ""


+ 20
- 1
consensus/reactor.go View File

@ -418,6 +418,10 @@ OUTER_LOOP:
}
func (conR *ConsensusReactor) gossipVotesRoutine(peer *p2p.Peer, ps *PeerState) {
// Simple hack to throttle logs upon sleep.
var sleeping = 0
OUTER_LOOP:
for {
// Manage disconnects from self or peer.
@ -428,6 +432,13 @@ OUTER_LOOP:
rs := conR.conS.GetRoundState()
prs := ps.GetRoundState()
switch sleeping {
case 1: // First sleep
sleeping = 2
case 2: // No more sleep
sleeping = 0
}
trySendVote := func(voteSet *VoteSet, peerVoteSet BitArray) (sent bool) {
if prs.Height == voteSet.Height() {
// Initialize Prevotes/Precommits/Commits if needed
@ -547,7 +558,15 @@ OUTER_LOOP:
}
}
// We sent nothing. Sleep...
if sleeping == 0 {
// We sent nothing. Sleep...
sleeping = 1
log.Debug("No votes to send, sleeping", "peer", peer)
} else if sleeping == 2 {
// Continued sleep...
sleeping = 1
}
time.Sleep(peerGossipSleepDuration)
continue OUTER_LOOP
}


+ 8
- 6
p2p/connection.go View File

@ -192,13 +192,15 @@ func (c *MConnection) Send(chId byte, msg interface{}) bool {
}
success := channel.sendBytes(binary.BinaryBytes(msg))
// Wake up sendRoutine if necessary
select {
case c.send <- struct{}{}:
default:
if success {
// Wake up sendRoutine if necessary
select {
case c.send <- struct{}{}:
default:
}
} else {
log.Warn("Send failed", "channel", chId, "connection", c, "msg", msg)
}
return success
}


Loading…
Cancel
Save