Merge pull request #150962 from rafiss/blathers/backport-release-25.3-150178

rafiss · web-flow · commit 707f7084b381 · 2025-08-01T10:17:53.000-04:00
release-25.3: kvpb: avoid over redaction of prev_err field
diff --git a/pkg/kv/kvclient/kvcoord/txn_coord_sender.go b/pkg/kv/kvclient/kvcoord/txn_coord_sender.go
@@ -1040,7 +1040,7 @@ func (tc *TxnCoordSender) updateStateLocked(
 	if kvpb.ErrPriority(pErr.GoError()) != kvpb.ErrorScoreUnambiguousError {
 		tc.mu.txnState = txnError
 		tc.mu.storedErr = kvpb.NewError(&kvpb.TxnAlreadyEncounteredErrorError{
-			PrevError: pErr.String(),
+			PrevError: redact.Sprintf("%v", pErr),
 		})
 	}
 
diff --git a/pkg/kv/kvpb/errors.proto b/pkg/kv/kvpb/errors.proto
@@ -573,7 +573,7 @@ message TransactionRetryWithProtoRefreshError {
 message TxnAlreadyEncounteredErrorError{
   // prev_error is the message from the error that the txn encountered
   // previously.
-  optional string prev_error = 1 [(gogoproto.nullable) = false];
+  optional string prev_error = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cockroachdb/redact.RedactableString"];
 }
 
 // An IntegerOverflowError indicates that an operation was aborted because

Original file line number	Diff line number	Diff line change
`@@ -1040,7 +1040,7 @@ func (tc *TxnCoordSender) updateStateLocked(`
`1040`	`1040`	`if kvpb.ErrPriority(pErr.GoError()) != kvpb.ErrorScoreUnambiguousError {`
`1041`	`1041`	`tc.mu.txnState = txnError`
`1042`	`1042`	`tc.mu.storedErr = kvpb.NewError(&kvpb.TxnAlreadyEncounteredErrorError{`
`1043`		`- PrevError: pErr.String(),`
	`1043`	`+ PrevError: redact.Sprintf("%v", pErr),`
`1044`	`1044`	`})`
`1045`	`1045`	`}`
`1046`	`1046`
Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ message TransactionRetryWithProtoRefreshError {`
`573`	`573`	`message TxnAlreadyEncounteredErrorError{`
`574`	`574`	`// prev_error is the message from the error that the txn encountered`
`575`	`575`	`// previously.`
`576`		`- optional string prev_error = 1 [(gogoproto.nullable) = false];`
	`576`	`+ optional string prev_error = 1 [(gogoproto.nullable) = false, (gogoproto.customtype) = "github.com/cockroachdb/redact.RedactableString"];`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`// An IntegerOverflowError indicates that an operation was aborted because`