Merge pull request #7492 from yyforyongyu/gossip-add-log

Add trace logs for `discovery` to catch test flakes

discovery/gossiper.go

@@ -1293,7 +1293,8 @@ func (d *AuthenticatedGossiper) sendRemoteBatch(annBatch []msgWithSenders) {
 
 	// We'll first attempt to filter out this new message for all peers
 	// that have active gossip syncers active.
-	for _, syncer := range syncerPeers {
+	for pub, syncer := range syncerPeers {
+		log.Tracef("Sending messages batch to GossipSyncer(%x)", pub)
 		syncer.FilterGossipMsgs(annBatch...)
 	}
 

discovery/syncer.go

@@ -1251,6 +1251,8 @@ func (g *GossipSyncer) FilterGossipMsgs(msgs ...msgWithSenders) {
 	// If the peer doesn't have an update horizon set, then we won't send
 	// it any new update messages.
 	if g.remoteUpdateHorizon == nil {
+		log.Tracef("GossipSyncer(%x): skipped due to nil "+
+			"remoteUpdateHorizon", g.cfg.peerPub[:])
 		return
 	}
 

lntest/node/config.go

@@ -207,7 +207,7 @@ func (cfg *BaseNodeConfig) GenArgs() []string {
 	nodeArgs := []string{
 		"--bitcoin.active",
 		"--nobootstrap",
-		"--debuglevel=debug",
+		"--debuglevel=debug,DISC=trace",
 		"--bitcoin.defaultchanconfs=1",
 		"--accept-keysend",
 		"--keep-failed-payment-attempts",

server.go

@@ -3202,7 +3202,7 @@ func (s *server) BroadcastMessage(skips map[route.Vertex]struct{},
 	for pubStr, sPeer := range s.peersByPub {
 		if skips != nil {
 			if _, ok := skips[sPeer.PubKey()]; ok {
-				srvrLog.Debugf("Skipping %x in broadcast with "+
+				srvrLog.Tracef("Skipping %x in broadcast with "+
 					"pubStr=%x", sPeer.PubKey(), pubStr)
 				continue
 			}