From 9cb9ca8b8e58cd16b9f25eb2de78b9d91641715d Mon Sep 17 00:00:00 2001
From: Pavel Kalinnikov <pavel@cockroachlabs.com>
Date: Thu, 19 Dec 2024 10:43:39 +0000
Subject: [PATCH] rac2: make AdmittedVector printing redaction-safe

Epic: none
Release note: none
---
 pkg/kv/kvserver/kvflowcontrol/rac2/log_tracker.go | 6 +++---
 pkg/raft/raftpb/raft.go                           | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/kv/kvserver/kvflowcontrol/rac2/log_tracker.go b/pkg/kv/kvserver/kvflowcontrol/rac2/log_tracker.go
index 40c11181b408..27fa3054fbf9 100644
--- a/pkg/kv/kvserver/kvflowcontrol/rac2/log_tracker.go
+++ b/pkg/kv/kvserver/kvflowcontrol/rac2/log_tracker.go
@@ -57,12 +57,12 @@ func (av AdmittedVector) SafeFormat(w redact.SafePrinter, _ rune) {
 	buf.Printf("term:%d, admitted:[", av.Term)
 	for pri, index := range av.Admitted {
 		if pri > 0 {
-			buf.Printf(",")
+			buf.SafeRune(',')
 		}
 		buf.Printf("%s:%d", raftpb.Priority(pri), index)
 	}
-	buf.Printf("]")
-	w.Printf("%v", buf)
+	buf.SafeRune(']')
+	w.SafeString(redact.SafeString(buf.String()))
 }
 
 // LogTracker tracks the durable and logically admitted state of a raft log.
diff --git a/pkg/raft/raftpb/raft.go b/pkg/raft/raftpb/raft.go
index 2169809f9339..019b97d60335 100644
--- a/pkg/raft/raftpb/raft.go
+++ b/pkg/raft/raftpb/raft.go
@@ -75,13 +75,13 @@ func (p Priority) String() string {
 func (p Priority) SafeFormat(w redact.SafePrinter, _ rune) {
 	switch p {
 	case LowPri:
-		w.Printf("LowPri")
+		w.SafeString("LowPri")
 	case NormalPri:
-		w.Printf("NormalPri")
+		w.SafeString("NormalPri")
 	case AboveNormalPri:
-		w.Printf("AboveNormalPri")
+		w.SafeString("AboveNormalPri")
 	case HighPri:
-		w.Printf("HighPri")
+		w.SafeString("HighPri")
 	default:
 		panic("invalid raft priority")
 	}