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

backupccl: enable skipped test #40639

Closed
wants to merge 1 commit into from
Closed

backupccl: enable skipped test #40639

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
7 changes: 4 additions & 3 deletions pkg/ccl/backupccl/backup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,6 @@ func getHighWaterMark(jobID int64, sqlDB *gosql.DB) (roachpb.Key, error) {
// work as intended on backup and restore jobs.
func TestBackupRestoreControlJob(t *testing.T) {
defer leaktest.AfterTest(t)()
t.Skip("#24136")

// force every call to update
defer jobs.TestingSetProgressThresholds()()
Expand All @@ -1034,7 +1033,7 @@ func TestBackupRestoreControlJob(t *testing.T) {
}

// PAUSE JOB and CANCEL JOB are racy in that it's hard to guarantee that the
// job is still running when executing a PAUSE or CANCEL--or that the job has
// job is still running when executing a PAUSE or CANCEL; or that the job has
// even started running. To synchronize, we install a store response filter
// which does a blocking receive whenever it encounters an export or import
// response. Below, when we want to guarantee the job is in progress, we do
Expand Down Expand Up @@ -1106,7 +1105,9 @@ func TestBackupRestoreControlJob(t *testing.T) {
`BACKUP DATABASE data TO $1`,
`RESTORE TABLE data.* FROM $1 WITH OPTIONS ('into_db'='pause')`,
} {
ops := []string{"PAUSE", "RESUME", "PAUSE"}
// TODO(spaskob): make the test more comprehensive after
// fixing the racy-ness of job control operations. See #24136.
ops := []string{"PAUSE"} // , "RESUME", "PAUSE"}
jobID, err := jobutils.RunJob(t, sqlDB, &allowResponse, ops, query, pauseDir)
if !testutils.IsError(err, "job paused") {
t.Fatalf("%d: expected 'job paused' error, but got %+v", i, err)
Expand Down