Merge cockroachdb#32572

32572: storage: improve raftDescribeMessage RejectHint handling r=petermattis a=tbg The RejectHint is always used. See: cockroachdb#32533 (comment) Release note: None Co-authored-by: Tobias Schottdorf <[email protected]>
tbg · Nov 23, 2018 · 1bcb46e · 1bcb46e
2 parents 9363293 + 610872e
commit 1bcb46e
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/pkg/storage/raft.go b/pkg/storage/raft.go
@@ -147,10 +147,7 @@ func raftDescribeMessage(m raftpb.Message, f raft.EntryFormatter) string {
 	var buf bytes.Buffer
 	fmt.Fprintf(&buf, "%x->%x %v Term:%d Log:%d/%d", m.From, m.To, m.Type, m.Term, m.LogTerm, m.Index)
 	if m.Reject {
-		fmt.Fprintf(&buf, " Rejected")
-		if m.RejectHint != 0 {
-			fmt.Fprintf(&buf, "(Hint:%d)", m.RejectHint)
-		}
+		fmt.Fprintf(&buf, " Rejected (Hint: %d)", m.RejectHint)
 	}
 	if m.Commit != 0 {
 		fmt.Fprintf(&buf, " Commit:%d", m.Commit)