rac2: make AdmittedVector printing redaction-safe

Epic: none Release note: none
cockroachdb · Dec 19, 2024 · 9cb9ca8 · 9cb9ca8
1 parent b1253a8
commit 9cb9ca8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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")
 	}