From 2993534f9d895659f45fc4e4fb40bbc3db1a5ad2 Mon Sep 17 00:00:00 2001 From: yacovm Date: Wed, 28 Jun 2017 17:22:48 +0300 Subject: [PATCH] [FAB-5052] [FAB-5051] Fine tune log messages FAB-5052: In gossip when a peer obtains an AliveMessage from a peer it hasn't received its certificate yet - it complains in the log in WARNING that it has received a message from some peer it can't verify its identity. This is actually a common scenario where a peer is restarted and its in-meory certificate store is now empty, but the other peers contact the peer and send it alive messages which he can't verify until it syncs its certificates with them. This startles users and I think we should reduce the logging severity from WARN to DEBUG. FAB-5051: When a peer is in a partition or is dead for a long enough time, gossip prints: Haven't heard from", , "for" The problem is that the id is a string of a hash and its printed in gibberish. It's not something humans can read, and we need to cast the string back to []byte so it would be human readable. Change-Id: I94bcad11623e53b5275ef8cecbdd3f9563fa1e77 Signed-off-by: yacovm --- gossip/discovery/discovery_impl.go | 6 +++--- gossip/gossip/gossip_impl.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gossip/discovery/discovery_impl.go b/gossip/discovery/discovery_impl.go index 748a358630d..c88bf9ad90e 100644 --- a/gossip/discovery/discovery_impl.go +++ b/gossip/discovery/discovery_impl.go @@ -390,7 +390,7 @@ func (d *gossipDiscoveryImpl) handleMsgFromComm(m *proto.SignedGossipMessage) { return } if !d.crypt.ValidateAliveMsg(dm) { - d.logger.Warningf("Alive message isn't authentic, someone spoofed %s's identity", dm.GetAliveMsg().Membership) + d.logger.Debugf("Alive message isn't authentic, someone spoofed %s's identity", dm.GetAliveMsg().Membership) continue } @@ -488,7 +488,7 @@ func (d *gossipDiscoveryImpl) handleAliveMessage(m *proto.SignedGossipMessage) { defer d.logger.Debug("Exiting") if !d.crypt.ValidateAliveMsg(m) { - d.logger.Warningf("Alive message isn't authentic, someone must be spoofing %s's identity", m.GetAliveMsg()) + d.logger.Debugf("Alive message isn't authentic, someone must be spoofing %s's identity", m.GetAliveMsg()) return } @@ -719,7 +719,7 @@ func (d *gossipDiscoveryImpl) getDeadMembers() []common.PKIidType { for id, last := range d.aliveLastTS { elapsedNonAliveTime := time.Since(last.lastSeen) if elapsedNonAliveTime.Nanoseconds() > getAliveExpirationTimeout().Nanoseconds() { - d.logger.Warning("Haven't heard from", id, "for", elapsedNonAliveTime) + d.logger.Warning("Haven't heard from", []byte(id), "for", elapsedNonAliveTime) dead = append(dead, common.PKIidType(id)) } } diff --git a/gossip/gossip/gossip_impl.go b/gossip/gossip/gossip_impl.go index 48098f0a857..6f1d35dce88 100644 --- a/gossip/gossip/gossip_impl.go +++ b/gossip/gossip/gossip_impl.go @@ -935,7 +935,7 @@ func (sa *discoverySecurityAdapter) ValidateAliveMsg(m *proto.SignedGossipMessag } if identity == nil { - sa.logger.Warning("Don't have certificate for", am) + sa.logger.Debug("Don't have certificate for", am) return false }