Skip to content

Commit

Permalink
sql/importer: unskip TestCSVImportCanBeResumed
Browse files Browse the repository at this point in the history
This unskips the test and adds a memory limit. The test completed
1500+ runs under stress. I believe cockroachdb#93782 resolved the main source of
flakiness here.

Fixes cockroachdb#91828

Release note: None
  • Loading branch information
stevendanna committed Dec 20, 2022
1 parent 6eddf3e commit 76e7646
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions pkg/sql/importer/import_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
Expand Down Expand Up @@ -649,9 +648,6 @@ func TestCSVImportCanBeResumed(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

// Flaky test.
skip.WithIssue(t, 91828)

defer setImportReaderParallelism(1)()
const batchSize = 5
defer TestingSetParallelImporterReaderBatchSize(batchSize)()
Expand All @@ -668,6 +664,7 @@ func TestCSVImportCanBeResumed(t *testing.T) {
BulkAdderFlushesEveryBatch: true,
},
},
SQLMemoryPoolSize: 1 << 30, // 1 GiB
})
registry := s.JobRegistry().(*jobs.Registry)
ctx := context.Background()
Expand Down

0 comments on commit 76e7646

Please sign in to comment.