Skip to content

Commit

Permalink
Merge #45270
Browse files Browse the repository at this point in the history
45270: importccl: Fix flaky tests r=miretskiy a=miretskiy

Flakes in these tests were caused by stresstest command.
Under load, the node would experience liveness issues,
causing all running jobs to be cancelled.

Verified running effected tests under stresstest for 20+
minutes, and 5+k iterations without any failures.

Release notes: None

Co-authored-by: Yevgeniy Miretskiy <yevgeniy@cockroachlabs.com>
  • Loading branch information
craig[bot] and Yevgeniy Miretskiy committed Feb 21, 2020
2 parents 9cc9af2 + 6df0669 commit aedf622
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/ccl/importccl/import_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@ func TestCSVImportCanBeResumed(t *testing.T) {
s, db, _ := serverutils.StartServer(t,
base.TestServerArgs{
Knobs: base.TestingKnobs{
RegistryLiveness: jobs.NewFakeNodeLiveness(1),
DistSQL: &execinfra.TestingKnobs{
BulkAdderFlushesEveryBatch: true,
},
Expand Down Expand Up @@ -677,7 +678,6 @@ func TestCSVImportCanBeResumed(t *testing.T) {

func TestCSVImportMarksFilesFullyProcessed(t *testing.T) {
defer leaktest.AfterTest(t)()
t.Skip("")
const batchSize = 5
defer TestingSetCsvInputReaderBatchSize(batchSize)()
defer row.TestingSetDatumRowConverterBatchSize(2 * batchSize)()
Expand All @@ -686,6 +686,7 @@ func TestCSVImportMarksFilesFullyProcessed(t *testing.T) {
s, db, _ := serverutils.StartServer(t,
base.TestServerArgs{
Knobs: base.TestingKnobs{
RegistryLiveness: jobs.NewFakeNodeLiveness(1),
DistSQL: &execinfra.TestingKnobs{
BulkAdderFlushesEveryBatch: true,
},
Expand Down

0 comments on commit aedf622

Please sign in to comment.