From 3ff22d503db1c0c3ab7862d7d794b889c2a59878 Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Tue, 30 Jan 2024 12:17:23 +0300 Subject: [PATCH] dbft: improve "ignoring"-related debug messages PrepareRequest and PrepareResponse are ignored not only because of view changing. Wrong log is misleading, so we'd better have the log that reflects the real state of things. Signed-off-by: Anna Shaleva --- dbft.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dbft.go b/dbft.go index a5560c9d..7f061335 100644 --- a/dbft.go +++ b/dbft.go @@ -295,7 +295,7 @@ func (d *DBFT) onPrepareRequest(msg payload.ConsensusPayload) { // ignore prepareRequest if we had already received it or // are in process of changing view if d.RequestSentOrReceived() { //|| (d.ViewChanging() && !d.MoreThanFNodesCommittedOrLost()) { - d.Logger.Debug("ignoring PrepareRequest due to view changing", + d.Logger.Debug("ignoring PrepareRequest", zap.Bool("sor", d.RequestSentOrReceived()), zap.Bool("viewChanging", d.ViewChanging()), zap.Bool("moreThanF", d.MoreThanFNodesCommittedOrLost())) @@ -422,7 +422,11 @@ func (d *DBFT) onPrepareResponse(msg payload.ConsensusPayload) { // ignore PrepareResponse if in process of changing view m := d.PreparationPayloads[msg.ValidatorIndex()] if m != nil || d.ViewChanging() && !d.MoreThanFNodesCommittedOrLost() { - d.Logger.Debug("ignoring PrepareResponse because of view changing") + d.Logger.Debug("ignoring PrepareResponse", + zap.Bool("dup", m != nil), + zap.Bool("sor", d.RequestSentOrReceived()), + zap.Bool("viewChanging", d.ViewChanging()), + zap.Bool("moreThanF", d.MoreThanFNodesCommittedOrLost())) return }