From 2659b30113fef9008f8d1211487d1aff5286c746 Mon Sep 17 00:00:00 2001
From: Ivan Kozlovic <ivan@synadia.com>
Date: Mon, 18 Apr 2022 13:35:08 -0600
Subject: [PATCH] [IMPROVED] JetStream: add file names for invalid checksums

On restart, we report when we find error in checksums, but we
did not report the name of the file.

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
---
 server/jetstream.go | 16 ++++++++--------
 server/raft.go      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/jetstream.go b/server/jetstream.go
index 0e3b226a..744788af 100644
--- a/server/jetstream.go
+++ b/server/jetstream.go
@@ -1118,11 +1118,11 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro
 		}
 		buf, err := ioutil.ReadFile(metafile)
 		if err != nil {
-			s.Warnf("  Error reading metafile %q: %v", metasum, err)
+			s.Warnf("  Error reading metafile %q: %v", metafile, err)
 			continue
 		}
 		if _, err := os.Stat(metasum); os.IsNotExist(err) {
-			s.Warnf("  Missing stream checksum for %q", metasum)
+			s.Warnf("  Missing stream checksum file %q", metasum)
 			continue
 		}
 		sum, err := ioutil.ReadFile(metasum)
@@ -1133,7 +1133,7 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro
 		hh.Write(buf)
 		checksum := hex.EncodeToString(hh.Sum(nil))
 		if checksum != string(sum) {
-			s.Warnf("  Stream metafile checksums do not match %q vs %q", sum, checksum)
+			s.Warnf("  Stream metafile %q: checksums do not match %q vs %q", metafile, sum, checksum)
 			continue
 		}
 
@@ -1153,7 +1153,7 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro
 
 		var cfg FileStreamInfo
 		if err := json.Unmarshal(buf, &cfg); err != nil {
-			s.Warnf("  Error unmarshalling stream metafile: %v", err)
+			s.Warnf("  Error unmarshalling stream metafile %q: %v", metafile, err)
 			continue
 		}
 
@@ -1221,7 +1221,7 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro
 			}
 			buf, err := ioutil.ReadFile(metafile)
 			if err != nil {
-				s.Warnf("    Error reading consumer metafile %q: %v", metasum, err)
+				s.Warnf("    Error reading consumer metafile %q: %v", metafile, err)
 				continue
 			}
 			if _, err := os.Stat(metasum); os.IsNotExist(err) {
@@ -1241,7 +1241,7 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro
 
 			var cfg FileConsumerInfo
 			if err := json.Unmarshal(buf, &cfg); err != nil {
-				s.Warnf("    Error unmarshalling consumer metafile: %v", err)
+				s.Warnf("    Error unmarshalling consumer metafile %q: %v", metafile, err)
 				continue
 			}
 			isEphemeral := !isDurableConsumer(&cfg.ConsumerConfig)
@@ -1252,7 +1252,7 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro
 			}
 			obs, err := e.mset.addConsumer(&cfg.ConsumerConfig)
 			if err != nil {
-				s.Warnf("    Error adding consumer: %v", err)
+				s.Warnf("    Error adding consumer %q: %v", cfg.Name, err)
 				continue
 			}
 			if isEphemeral {
@@ -1266,7 +1266,7 @@ func (a *Account) EnableJetStream(limits map[string]JetStreamAccountLimits) erro
 			err = obs.readStoredState(lseq)
 			obs.mu.Unlock()
 			if err != nil {
-				s.Warnf("    Error restoring consumer state: %v", err)
+				s.Warnf("    Error restoring consumer %q state: %v", cfg.Name, err)
 			}
 		}
 	}
diff --git a/server/raft.go b/server/raft.go
index 77899c5b..868fce8a 100644
--- a/server/raft.go
+++ b/server/raft.go
@@ -1597,7 +1597,7 @@ func (n *raft) run() {
 			case <-s.quitCh:
 				return
 			case <-time.After(100 * time.Millisecond):
-				s.RateLimitWarnf("Waiting for routing to established...")
+				s.RateLimitWarnf("Waiting for routing to be established...")
 			}
 		} else {
 			break