kvserver: Remove SnapshotReservationTimeoutError

SnapshotReservationTimeoutError is a part of the gRPC response error that was getting overly redacted. The overall gRPC response should be handled to fix the over redaction instead just the error part.

Epic: CRDB-37533
Part of: CRDB-44885
Release note: None

Author: Abhinav1299

pkg/kv/kvpb/errors.go

@@ -1828,34 +1828,6 @@ func NewKeyCollisionError(key roachpb.Key, value []byte) error {
 	return ret
 }
 
-// snapshotReservationTimeoutError represents an error that occurs when
-// giving up during snapshot reservation due to cluster setting timeout.
-type SnapshotReservationTimeoutError struct {
-	cause       error
-	settingName string
-}
-
-// Error implements the error interface.
-func (e *SnapshotReservationTimeoutError) Error() string {
-	return redact.Sprint(e).StripMarkers()
-}
-
-// SafeFormatError implements errors.SafeFormatter.
-func (e *SnapshotReservationTimeoutError) SafeFormatError(p errors.Printer) (next error) {
-	p.Printf("giving up during snapshot reservation due to cluster setting %q: %v", redact.SafeString(e.settingName), redact.SafeString(e.cause.Error()))
-	return nil
-}
-
-// NewSnapshotReservationTimeoutError creates a new SnapshotReservationTimeoutError.
-func NewSnapshotReservationTimeoutError(
-	cause error, settingName string,
-) *SnapshotReservationTimeoutError {
-	return &SnapshotReservationTimeoutError{
-		cause:       cause,
-		settingName: settingName,
-	}
-}
-
 // NewExclusionViolationError creates a new ExclusionViolationError. This error
 // is returned by requests that encounter an existing value written at a
 // timestamp at which they expected to have an exclusive lock on the key. This
@@ -1960,5 +1932,4 @@ var _ errors.SafeFormatter = &UnhandledRetryableError{}
 var _ errors.SafeFormatter = &ReplicaUnavailableError{}
 var _ errors.SafeFormatter = &ProxyFailedError{}
 var _ errors.SafeFormatter = &KeyCollisionError{}
-var _ errors.SafeFormatter = &SnapshotReservationTimeoutError{}
 var _ errors.SafeFormatter = &ExclusionViolationError{}

pkg/kv/kvserver/store_snapshot.go

@@ -273,8 +273,10 @@ func (s *Store) throttleSnapshot(
 			if err := ctx.Err(); err != nil {
 				return nil, errors.Wrap(err, "acquiring snapshot reservation")
 			}
-			return nil, kvpb.NewSnapshotReservationTimeoutError(
-				queueCtx.Err(), string(snapshotReservationQueueTimeoutFraction.Name()),
+			return nil, errors.Wrapf(
+				queueCtx.Err(),
+				"giving up during snapshot reservation due to cluster setting %q",
+				snapshotReservationQueueTimeoutFraction.Name(),
 			)
 		case <-s.stopper.ShouldQuiesce():
 			return nil, errors.Errorf("stopped")

pkg/kv/kvserver/store_test.go

@@ -3471,11 +3471,6 @@ func TestReserveSnapshotQueueTimeoutAvoidsStarvation(t *testing.T) {
 						if errors.Is(err, context.DeadlineExceeded) {
 							return nil
 						}
-						// Also handle the new SnapshotReservationTimeoutError as a timeout condition
-						var snapshotTimeoutErr *kvpb.SnapshotReservationTimeoutError
-						if errors.As(err, &snapshotTimeoutErr) {
-							return nil
-						}
 						return err
 					}
 					defer cleanup()