From 5329159b5ef9ee7c28a2dfaff1546f856da71870 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Wed, 4 Nov 2015 07:05:26 -0800 Subject: [PATCH] rafthttp: remove failureMap from peerStatus The logging mechanism is verbose, so it is removed from peerStatus. We would like to see the status change of connection with peers, and one error that leads to deactivation. There is no need to print out all non-repeated errors. --- rafthttp/peer_status.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/rafthttp/peer_status.go b/rafthttp/peer_status.go index 97893fc92..d838b7ab3 100644 --- a/rafthttp/peer_status.go +++ b/rafthttp/peer_status.go @@ -31,14 +31,12 @@ type peerStatus struct { id types.ID mu sync.Mutex // protect variables below active bool - failureMap map[failureType]string activeSince time.Time } func newPeerStatus(id types.ID) *peerStatus { return &peerStatus{ - id: id, - failureMap: make(map[failureType]string), + id: id, } } @@ -49,25 +47,21 @@ func (s *peerStatus) activate() { plog.Infof("the connection with %s became active", s.id) s.active = true s.activeSince = time.Now() - s.failureMap = make(map[failureType]string) } } func (s *peerStatus) deactivate(failure failureType, reason string) { s.mu.Lock() defer s.mu.Unlock() + msg := fmt.Sprintf("failed to %s %s on %s (%s)", failure.action, s.id, failure.source, reason) if s.active { + plog.Errorf(msg) plog.Infof("the connection with %s became inactive", s.id) s.active = false s.activeSince = time.Time{} - } - logline := fmt.Sprintf("failed to %s %s on %s (%s)", failure.action, s.id, failure.source, reason) - if r, ok := s.failureMap[failure]; ok && r == reason { - plog.Debugf(logline) return } - s.failureMap[failure] = reason - plog.Errorf(logline) + plog.Debugf(msg) } func (s *peerStatus) isActive() bool {