Merge pull request #134256 from cockroachdb/blathers/backport-release-24.1-131545

release-24.1: kvpb,kvserver: add range id, span to BatchTimestampBeforeGCError

Author: arulajmani

pkg/ccl/changefeedccl/changefeedbase/errors_test.go

@@ -37,16 +37,16 @@ func TestAsTerminalError(t *testing.T) {
 
 		// Regardless of the state of the node drain, or the type of error,
 		// context error takes precedence.
-		require.Regexp(t, context.Canceled,
-			changefeedbase.AsTerminalError(canceledCtx, nodeIsDraining, errors.New("ignored")))
-		require.Regexp(t, context.Canceled,
-			changefeedbase.AsTerminalError(canceledCtx, nodeIsNotDraining, errors.New("ignored")))
+		require.Regexp(t, context.Canceled.Error(),
+			changefeedbase.AsTerminalError(canceledCtx, nodeIsDraining, errors.New("ignored")).Error())
+		require.Regexp(t, context.Canceled.Error(),
+			changefeedbase.AsTerminalError(canceledCtx, nodeIsNotDraining, errors.New("ignored")).Error())
 	})
 
 	t.Run("node drain marked as job retry", func(t *testing.T) {
 		cause := errors.New("some error happened")
 		termErr := changefeedbase.AsTerminalError(context.Background(), nodeIsDraining, cause)
-		require.Regexp(t, cause.Error(), termErr)
+		require.Contains(t, cause.Error(), termErr.Error())
 		require.True(t, jobs.IsRetryJobError(termErr))
 	})
 
@@ -55,19 +55,19 @@ func TestAsTerminalError(t *testing.T) {
 		cause := changefeedbase.WithTerminalError(
 			changefeedbase.MarkRetryableError(errors.New("confusing error")))
 		termErr := changefeedbase.AsTerminalError(context.Background(), nodeIsNotDraining, cause)
-		require.Regexp(t, cause.Error(), termErr)
+		require.Contains(t, cause.Error(), termErr.Error())
 	})
 
 	t.Run("assertion failures are terminal", func(t *testing.T) {
 		// Assertion failures are terminal, even if marked as retry-able.
 		cause := changefeedbase.MarkRetryableError(errors.AssertionFailedf("though shall not pass"))
 		termErr := changefeedbase.AsTerminalError(context.Background(), nodeIsNotDraining, cause)
-		require.Regexp(t, cause.Error(), termErr)
+		require.Contains(t, cause.Error(), termErr.Error())
 	})
 
 	t.Run("gc error is terminal", func(t *testing.T) {
 		cause := changefeedbase.MarkRetryableError(&kvpb.BatchTimestampBeforeGCError{})
 		termErr := changefeedbase.AsTerminalError(context.Background(), nodeIsNotDraining, cause)
-		require.Regexp(t, cause.Error(), termErr)
+		require.Contains(t, cause.Error(), termErr.Error())
 	})
 }

pkg/kv/kvpb/errors.go

@@ -1354,7 +1354,11 @@ func (e *BatchTimestampBeforeGCError) Error() string {
 }
 
 func (e *BatchTimestampBeforeGCError) SafeFormatError(p errors.Printer) (next error) {
-	p.Printf("batch timestamp %v must be after replica GC threshold %v", e.Timestamp, e.Threshold)
+	p.Printf(
+		"batch timestamp %v must be after replica GC threshold %v (r%d: %s)",
+		e.Timestamp, e.Threshold, e.RangeID,
+		roachpb.RSpan{Key: []byte(e.StartKey), EndKey: []byte(e.EndKey)},
+	)
 	return nil
 }
 

pkg/kv/kvpb/errors.proto

@@ -579,6 +579,11 @@ message BatchTimestampBeforeGCError {
   // that has been marked as excluded from a backup via
   // `ALTER TABLE ... SET (exclude_data_from_backup = true)`.
   optional bool data_excluded_from_backup = 3 [(gogoproto.nullable) = false];
+  optional int64 range_id = 4 [(gogoproto.nullable) = false,
+    (gogoproto.customname) = "RangeID",
+    (gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/roachpb.RangeID"];
+  optional bytes start_key = 5 [(gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/roachpb.Key"];
+  optional bytes end_key = 6 [(gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/roachpb.Key"];
 }
 
 // A MVCCHistoryMutationError indicates that MVCC history was unexpectedly

pkg/kv/kvpb/errors_test.go

@@ -282,7 +282,7 @@ func TestErrorRedaction(t *testing.T) {
 		},
 		{
 			err:    &BatchTimestampBeforeGCError{},
-			expect: "batch timestamp 0,0 must be after replica GC threshold 0,0",
+			expect: "batch timestamp 0,0 must be after replica GC threshold 0,0 (r0: ‹/Min›)",
 		},
 		{
 			err:    &TxnAlreadyEncounteredErrorError{},

pkg/kv/kvserver/kvserverbase/forced_error.go

@@ -256,6 +256,9 @@ func CheckForcedErr(
 			ForcedError: kvpb.NewError(&kvpb.BatchTimestampBeforeGCError{
 				Timestamp: wts,
 				Threshold: *replicaState.GCThreshold,
+				RangeID:   replicaState.Desc.RangeID,
+				StartKey:  replicaState.Desc.StartKey.AsRawKey(),
+				EndKey:    replicaState.Desc.EndKey.AsRawKey(),
 			}),
 		}
 	}

pkg/kv/kvserver/replica.go

@@ -1993,10 +1993,14 @@ func (r *Replica) checkTSAboveGCThresholdRLocked(
 	if threshold.Less(ts) {
 		return nil
 	}
+	desc := r.descRLocked()
 	return &kvpb.BatchTimestampBeforeGCError{
 		Timestamp:              ts,
 		Threshold:              threshold,
 		DataExcludedFromBackup: r.excludeReplicaFromBackupRLocked(ctx, rspan),
+		RangeID:                desc.RangeID,
+		StartKey:               desc.StartKey.AsRawKey(),
+		EndKey:                 desc.EndKey.AsRawKey(),
 	}
 }