Merge pull request #62622 from jordanlewis/backport21.1-62604

release-21.1: sql: fix flaky batch size test
cockroachdb · Mar 26, 2021 · ef63f21 · ef63f21
2 parents 7225cba + 3aee4f7
commit ef63f21
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/pkg/sql/colfetcher/BUILD.bazel b/pkg/sql/colfetcher/BUILD.bazel
@@ -59,6 +59,7 @@ go_test(
         "//pkg/security",
         "//pkg/security/securitytest",
         "//pkg/server",
+        "//pkg/testutils",
         "//pkg/testutils/serverutils",
         "//pkg/testutils/skip",
         "//pkg/testutils/testcluster",

diff --git a/pkg/sql/colfetcher/vectorized_batch_size_test.go b/pkg/sql/colfetcher/vectorized_batch_size_test.go
@@ -12,12 +12,14 @@ package colfetcher_test
 
 import (
 	"context"
+	"fmt"
 	"regexp"
 	"strconv"
 	"strings"
 	"testing"
 
 	"github.com/cockroachdb/cockroach/pkg/base"
+	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
@@ -45,30 +47,38 @@ func TestScanBatchSize(t *testing.T) {
 
 	conn := tc.Conns[0]
 
-	_, err := conn.ExecContext(ctx, `CREATE TABLE t (a PRIMARY KEY) AS SELECT generate_series(1, 511)`)
+	_, err := conn.ExecContext(ctx, `CREATE TABLE t (a PRIMARY KEY) AS SELECT generate_series(1, 511); ANALYZE t`)
 	assert.NoError(t, err)
 
-	rows, err := conn.QueryContext(ctx, `EXPLAIN ANALYZE (VERBOSE, DISTSQL) SELECT * FROM t`)
-	assert.NoError(t, err)
-	batchCountRegex := regexp.MustCompile(`vectorized batch count: (\d+)`)
-	var found bool
-	var sb strings.Builder
-	for rows.Next() {
-		var res string
-		assert.NoError(t, rows.Scan(&res))
-		sb.WriteString(res)
-		sb.WriteByte('\n')
-		matches := batchCountRegex.FindStringSubmatch(res)
-		if len(matches) == 0 {
-			continue
-		}
-		foundBatches, err := strconv.Atoi(matches[1])
+	testutils.SucceedsSoon(t, func() error {
+		rows, err := conn.QueryContext(ctx, `EXPLAIN ANALYZE (VERBOSE, DISTSQL) SELECT * FROM t`)
 		assert.NoError(t, err)
-		assert.Equal(t, 1, foundBatches, "should use just 1 batch to scan 511 rows")
-		found = true
-		break
-	}
-	if !found {
-		t.Fatalf("expected to find a vectorized batch count; found nothing. text:\n%s", sb.String())
-	}
+		batchCountRegex := regexp.MustCompile(`vectorized batch count: (\d+)`)
+		var found, failed bool
+		var foundBatches int
+		var sb strings.Builder
+		for rows.Next() {
+			var res string
+			assert.NoError(t, rows.Scan(&res))
+			sb.WriteString(res)
+			sb.WriteByte('\n')
+			matches := batchCountRegex.FindStringSubmatch(res)
+			if len(matches) == 0 {
+				continue
+			}
+			foundBatches, err = strconv.Atoi(matches[1])
+			assert.NoError(t, err)
+			if foundBatches != 1 {
+				failed = true
+			}
+			found = true
+		}
+		if failed {
+			return fmt.Errorf("should use just 1 batch to scan 511 rows, found %d:\n%s", foundBatches, sb.String())
+		}
+		if !found {
+			t.Fatalf("expected to find a vectorized batch count; found nothing. text:\n%s", sb.String())
+		}
+		return nil
+	})
 }