Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Permalink
backupccl: enable skipped backup test
Browse files Browse the repository at this point in the history
The test was flaky and hence skipped for quite sometime.
I wasn't able to fix it in it's current form because of
the complexity of how we enable job control statements
today. This will be revisited once we have a saner
implementation. The folloup is tracked at cockroachdb#40638.

Touches cockroachdb#40638.
Fixes cockroachdb#24136.

Release notes (bug fix): none.
  • Loading branch information
spaskob committed Jan 31, 2020
1 parent 1a3c232 commit 9a4b62d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions pkg/ccl/backupccl/backup_test.go
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

0 comments on commit 9a4b62d

Please sign in to comment.