From 5bf1bdcfb4a2f1cc807a1a972cc564f9d10d0d59 Mon Sep 17 00:00:00 2001 From: Sam Kleinman Date: Tue, 11 Jan 2022 12:56:52 -0500 Subject: [PATCH] reactors: skip log on some routine cancels (#7556) --- cmd/priv_val_server/main.go | 1 - internal/blocksync/reactor.go | 1 - internal/consensus/reactor.go | 1 - internal/consensus/ticker.go | 2 -- internal/evidence/reactor.go | 1 - internal/mempool/reactor.go | 1 - internal/p2p/conn/connection.go | 5 ----- internal/p2p/pex/reactor.go | 2 -- internal/p2p/router.go | 9 --------- internal/statesync/reactor.go | 1 - rpc/jsonrpc/client/ws_client.go | 2 -- 11 files changed, 26 deletions(-) diff --git a/cmd/priv_val_server/main.go b/cmd/priv_val_server/main.go index baacadf1e..bdd5091d9 100644 --- a/cmd/priv_val_server/main.go +++ b/cmd/priv_val_server/main.go @@ -138,7 +138,6 @@ func main() { defer opcancel() go func() { <-opctx.Done() - logger.Debug("SignerServer: calling Close") if *prometheusAddr != "" { ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) defer cancel() diff --git a/internal/blocksync/reactor.go b/internal/blocksync/reactor.go index b3142d953..a67b50874 100644 --- a/internal/blocksync/reactor.go +++ b/internal/blocksync/reactor.go @@ -354,7 +354,6 @@ func (r *Reactor) processPeerUpdates(ctx context.Context) { for { select { case <-ctx.Done(): - r.logger.Debug("stopped listening on peer updates channel; closing...") return case peerUpdate := <-r.peerUpdates.Updates(): r.processPeerUpdate(peerUpdate) diff --git a/internal/consensus/reactor.go b/internal/consensus/reactor.go index 6c1bbae5f..127b175bc 100644 --- a/internal/consensus/reactor.go +++ b/internal/consensus/reactor.go @@ -1455,7 +1455,6 @@ func (r *Reactor) processPeerUpdates(ctx context.Context) { for { select { case <-ctx.Done(): - r.logger.Debug("stopped listening on peer updates channel; closing...") return case peerUpdate := <-r.peerUpdates.Updates(): r.processPeerUpdate(ctx, peerUpdate) diff --git a/internal/consensus/ticker.go b/internal/consensus/ticker.go index 686ca6b7a..26570b734 100644 --- a/internal/consensus/ticker.go +++ b/internal/consensus/ticker.go @@ -81,7 +81,6 @@ func (t *timeoutTicker) stopTimer() { select { case <-t.timer.C: default: - t.logger.Debug("Timer already stopped") } } } @@ -90,7 +89,6 @@ func (t *timeoutTicker) stopTimer() { // timers are interupted and replaced by new ticks from later steps // timeouts of 0 on the tickChan will be immediately relayed to the tockChan func (t *timeoutTicker) timeoutRoutine(ctx context.Context) { - t.logger.Debug("Starting timeout routine") var ti timeoutInfo for { select { diff --git a/internal/evidence/reactor.go b/internal/evidence/reactor.go index 8fb7bece5..2a6ed4ff9 100644 --- a/internal/evidence/reactor.go +++ b/internal/evidence/reactor.go @@ -255,7 +255,6 @@ func (r *Reactor) processPeerUpdates(ctx context.Context) { case peerUpdate := <-r.peerUpdates.Updates(): r.processPeerUpdate(ctx, peerUpdate) case <-ctx.Done(): - r.logger.Debug("stopped listening on peer updates channel; closing...") return } } diff --git a/internal/mempool/reactor.go b/internal/mempool/reactor.go index d1d027bd8..7ef80aecd 100644 --- a/internal/mempool/reactor.go +++ b/internal/mempool/reactor.go @@ -281,7 +281,6 @@ func (r *Reactor) processPeerUpdates(ctx context.Context) { for { select { case <-ctx.Done(): - r.logger.Debug("stopped listening on peer updates channel; closing...") return case peerUpdate := <-r.peerUpdates.Updates(): r.processPeerUpdate(ctx, peerUpdate) diff --git a/internal/p2p/conn/connection.go b/internal/p2p/conn/connection.go index 04ecfc92c..ba9e9a2e3 100644 --- a/internal/p2p/conn/connection.go +++ b/internal/p2p/conn/connection.go @@ -353,7 +353,6 @@ FOR_LOOP: channel.updateStats() } case <-c.pingTimer.C: - c.logger.Debug("Send Ping") _n, err = protoWriter.WriteMsg(mustWrapPacket(&tmp2p.PacketPing{})) if err != nil { c.logger.Error("Failed to send PacketPing", "err", err) @@ -370,13 +369,11 @@ FOR_LOOP: c.flush() case timeout := <-c.pongTimeoutCh: if timeout { - c.logger.Debug("Pong timeout") err = errors.New("pong timeout") } else { c.stopPongTimer() } case <-c.pong: - c.logger.Debug("Send Pong") _n, err = protoWriter.WriteMsg(mustWrapPacket(&tmp2p.PacketPong{})) if err != nil { c.logger.Error("Failed to send PacketPong", "err", err) @@ -528,14 +525,12 @@ FOR_LOOP: case *tmp2p.Packet_PacketPing: // TODO: prevent abuse, as they cause flush()'s. // https://github.com/tendermint/tendermint/issues/1190 - c.logger.Debug("Receive Ping") select { case c.pong <- struct{}{}: default: // never block } case *tmp2p.Packet_PacketPong: - c.logger.Debug("Receive Pong") select { case c.pongTimeoutCh <- false: default: diff --git a/internal/p2p/pex/reactor.go b/internal/p2p/pex/reactor.go index b1f33081a..82a3e2ca8 100644 --- a/internal/p2p/pex/reactor.go +++ b/internal/p2p/pex/reactor.go @@ -181,7 +181,6 @@ func (r *Reactor) processPexCh(ctx context.Context) { select { case <-ctx.Done(): - r.logger.Debug("stopped listening on PEX channel; closing...") return // outbound requests for new peers @@ -215,7 +214,6 @@ func (r *Reactor) processPeerUpdates(ctx context.Context) { for { select { case <-ctx.Done(): - r.logger.Debug("stopped listening on peer updates channel; closing...") return case peerUpdate := <-r.peerUpdates.Updates(): r.processPeerUpdate(peerUpdate) diff --git a/internal/p2p/router.go b/internal/p2p/router.go index 6c6bf78ed..c60fe30a5 100644 --- a/internal/p2p/router.go +++ b/internal/p2p/router.go @@ -472,8 +472,6 @@ func (r *Router) dialSleep(ctx context.Context) { // acceptPeers accepts inbound connections from peers on the given transport, // and spawns goroutines that route messages to/from them. func (r *Router) acceptPeers(ctx context.Context, transport Transport) { - r.logger.Debug("starting accept routine", "transport", transport) - for { conn, err := transport.Accept(ctx) switch err { @@ -555,8 +553,6 @@ func (r *Router) openConnection(ctx context.Context, conn Connection) { // dialPeers maintains outbound connections to peers by dialing them. func (r *Router) dialPeers(ctx context.Context) { - r.logger.Debug("starting dial routine") - addresses := make(chan NodeAddress) wg := &sync.WaitGroup{} @@ -587,7 +583,6 @@ LOOP: address, err := r.peerManager.DialNext(ctx) switch { case errors.Is(err, context.Canceled): - r.logger.Debug("stopping dial routine") break LOOP case err != nil: r.logger.Error("failed to find next peer to dial", "err", err) @@ -917,16 +912,12 @@ func (r *Router) sendPeer(ctx context.Context, peerID types.NodeID, conn Connect // evictPeers evicts connected peers as requested by the peer manager. func (r *Router) evictPeers(ctx context.Context) { - r.logger.Debug("starting evict routine") - for { peerID, err := r.peerManager.EvictNext(ctx) switch { case errors.Is(err, context.Canceled): - r.logger.Debug("stopping evict routine") return - case err != nil: r.logger.Error("failed to find next peer to evict", "err", err) return diff --git a/internal/statesync/reactor.go b/internal/statesync/reactor.go index b9113cc21..25b30d9ad 100644 --- a/internal/statesync/reactor.go +++ b/internal/statesync/reactor.go @@ -887,7 +887,6 @@ func (r *Reactor) processPeerUpdates(ctx context.Context) { for { select { case <-ctx.Done(): - r.logger.Debug("stopped listening on peer updates channel; closing...") return case peerUpdate := <-r.peerUpdates.Updates(): r.processPeerUpdate(ctx, peerUpdate) diff --git a/rpc/jsonrpc/client/ws_client.go b/rpc/jsonrpc/client/ws_client.go index 80520e2a3..8be59737a 100644 --- a/rpc/jsonrpc/client/ws_client.go +++ b/rpc/jsonrpc/client/ws_client.go @@ -411,7 +411,6 @@ func (c *WSClient) writeRoutine(ctx context.Context) { c.mtx.Lock() c.sentLastPingAt = time.Now() c.mtx.Unlock() - c.Logger.Debug("sent ping") case <-c.readRoutineQuit: return case <-ctx.Done(): @@ -445,7 +444,6 @@ func (c *WSClient) readRoutine(ctx context.Context) { c.mtx.RUnlock() c.PingPongLatencyTimer.UpdateSince(t) - c.Logger.Debug("got pong") return nil })