Skip to content

Commit

Permalink
roachtest: fix import/tpch roachtest for release-19.1
Browse files Browse the repository at this point in the history
See #39113 (comment).

This was broken by #40576.

Release note: None
  • Loading branch information
nvanbenschoten committed Sep 11, 2019
1 parent 4146821 commit c2aa390
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion pkg/cmd/roachtest/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ package main
import (
"context"
"fmt"
"strings"
"time"

"github.com/cockroachdb/cockroach/pkg/util/retry"
Expand Down Expand Up @@ -136,6 +137,11 @@ func registerImportTPCH(r *testRegistry) {
`); err != nil {
t.Fatal(err)
}
if _, err := conn.Exec(
`SET CLUSTER SETTING kv.bulk_ingest.max_index_buffer_size = '2gb'`,
); err != nil && !strings.Contains(err.Error(), "unknown cluster setting") {
t.Fatal(err)
}
// Wait for all nodes to be ready.
if err := retry.ForDuration(time.Second*30, func() error {
var nodes int
Expand Down Expand Up @@ -173,7 +179,6 @@ func registerImportTPCH(r *testRegistry) {
t.WorkerStatus(`running import`)
defer t.WorkerStatus()
_, err := conn.Exec(`
SET CLUSTER SETTING kv.bulk_ingest.max_index_buffer_size = '2gb';
IMPORT TABLE csv.lineitem
CREATE USING 'gs://cockroach-fixtures/tpch-csv/schema/lineitem.sql'
CSV DATA (
Expand Down

0 comments on commit c2aa390

Please sign in to comment.