Skip to content
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

changefeedccl: surface errors when job fails in alter changefeed tests #106438

Merged
merged 1 commit into from
Jul 10, 2023
Merged

changefeedccl: surface errors when job fails in alter changefeed tests #106438

Show file tree
Hide file tree
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
39 changes: 11 additions & 28 deletions pkg/ccl/changefeedccl/alter_changefeed_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,17 +1156,9 @@ func TestAlterChangefeedAddTargetsDuringSchemaChangeError(t *testing.T) {
_ = g.Wait()
}()

// Helper to read job progress
loadProgress := func() jobspb.Progress {
jobID := jobFeed.JobID()
job, err := jobRegistry.LoadJob(context.Background(), jobID)
require.NoError(t, err)
return job.Progress()
}

// Ensure initial backfill completes
testutils.SucceedsSoon(t, func() error {
prog := loadProgress()
prog := loadProgress(t, jobFeed, jobRegistry)
if p := prog.GetHighWater(); p != nil && !p.IsEmpty() {
return nil
}
Expand Down Expand Up @@ -1210,7 +1202,7 @@ func TestAlterChangefeedAddTargetsDuringSchemaChangeError(t *testing.T) {
}

// Check if we've set a checkpoint yet
progress := loadProgress()
progress := loadProgress(t, jobFeed, jobRegistry)
if p := progress.GetChangefeed(); p != nil && p.Checkpoint != nil && len(p.Checkpoint.Spans) > 0 {
initialCheckpoint.Add(p.Checkpoint.Spans...)
atomic.StoreInt32(&foundCheckpoint, 1)
Expand Down Expand Up @@ -1238,7 +1230,10 @@ func TestAlterChangefeedAddTargetsDuringSchemaChangeError(t *testing.T) {
if atomic.LoadInt32(&foundCheckpoint) != 0 {
return nil
}
return errors.New("waiting for checkpoint")
if err := jobFeed.FetchTerminalJobErr(); err != nil {
return err
}
return errors.Newf("waiting for checkpoint")
})

require.NoError(t, jobFeed.Pause())
Expand Down Expand Up @@ -1339,16 +1334,10 @@ func TestAlterChangefeedAddTargetsDuringBackfill(t *testing.T) {
}()

jobFeed := testFeed.(cdctest.EnterpriseTestFeed)
loadProgress := func() jobspb.Progress {
jobID := jobFeed.JobID()
job, err := registry.LoadJob(context.Background(), jobID)
require.NoError(t, err)
return job.Progress()
}

// Wait for non-nil checkpoint.
testutils.SucceedsSoon(t, func() error {
progress := loadProgress()
progress := loadProgress(t, jobFeed, registry)
if p := progress.GetChangefeed(); p != nil && p.Checkpoint != nil && len(p.Checkpoint.Spans) > 0 {
return nil
}
Expand All @@ -1357,7 +1346,7 @@ func TestAlterChangefeedAddTargetsDuringBackfill(t *testing.T) {

// Pause the job and read and verify the latest checkpoint information.
require.NoError(t, jobFeed.Pause())
progress := loadProgress()
progress := loadProgress(t, jobFeed, registry)
require.NotNil(t, progress.GetChangefeed())
h := progress.GetHighWater()
noHighWater := h == nil || h.IsEmpty()
Expand Down Expand Up @@ -1385,15 +1374,15 @@ func TestAlterChangefeedAddTargetsDuringBackfill(t *testing.T) {

// Wait for the high water mark to be non-zero.
testutils.SucceedsSoon(t, func() error {
prog := loadProgress()
prog := loadProgress(t, jobFeed, registry)
if p := prog.GetHighWater(); p != nil && !p.IsEmpty() {
return nil
}
return errors.New("waiting for highwater")
})

// At this point, highwater mark should be set, and previous checkpoint should be gone.
progress = loadProgress()
progress = loadProgress(t, jobFeed, registry)
require.NotNil(t, progress.GetChangefeed())
require.Equal(t, 0, len(progress.GetChangefeed().Checkpoint.Spans))

Expand Down Expand Up @@ -1569,14 +1558,8 @@ func TestAlterChangefeedWithOldCursorFromCreateChangefeed(t *testing.T) {
castedFeed, ok := testFeed.(cdctest.EnterpriseTestFeed)
require.True(t, ok)

loadProgress := func() jobspb.Progress {
job, err := registry.LoadJob(context.Background(), castedFeed.JobID())
require.NoError(t, err)
return job.Progress()
}

testutils.SucceedsSoon(t, func() error {
progress := loadProgress()
progress := loadProgress(t, castedFeed, registry)
if hw := progress.GetHighWater(); hw != nil && cursor.LessEq(*hw) {
return nil
}
Expand Down
13 changes: 13 additions & 0 deletions pkg/ccl/changefeedccl/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,19 @@ func expectNotice(t *testing.T, s serverutils.TestTenantInterface, sql string, e
require.Equal(t, expected, actual)
}

func loadProgress(
t *testing.T, jobFeed cdctest.EnterpriseTestFeed, jobRegistry *jobs.Registry,
) jobspb.Progress {
t.Helper()
jobID := jobFeed.JobID()
job, err := jobRegistry.LoadJob(context.Background(), jobID)
require.NoError(t, err)
if job.Status().Terminal() {
t.Errorf("tried to load progress for job %v but it has reached terminal status %s with error %s", job, job.Status(), jobFeed.FetchTerminalJobErr())
}
return job.Progress()
}

func feed(
t testing.TB, f cdctest.TestFeedFactory, create string, args ...interface{},
) cdctest.TestFeed {
Expand Down