Skip to content

release-24.1: changefeedccl: fix reversed args for containment check in test logic #153208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicktrav merged 1 commit into from
Sep 10, 2025
Merged

release-24.1: changefeedccl: fix reversed args for containment check in test logic #153208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/ccl/changefeedccl/changefeedbase/errors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestAsTerminalError(t *testing.T) {
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.Contains(t, cause.Error(), termErr.Error())
require.Contains(t, termErr.Error(), cause.Error())
require.True(t, jobs.IsRetryJobError(termErr))
})

Expand All @@ -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.Contains(t, cause.Error(), termErr.Error())
require.Contains(t, termErr.Error(), cause.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.Contains(t, cause.Error(), termErr.Error())
require.Contains(t, termErr.Error(), cause.Error())
})

t.Run("gc error is terminal", func(t *testing.T) {
cause := changefeedbase.MarkRetryableError(&kvpb.BatchTimestampBeforeGCError{})
termErr := changefeedbase.AsTerminalError(context.Background(), nodeIsNotDraining, cause)
require.Contains(t, cause.Error(), termErr.Error())
require.Contains(t, termErr.Error(), cause.Error())
})
}