Skip to content

Commit 62bb107

Browse files
craig[bot]mw5hrickystewart
committed
157233: Add fingerprint checking to import roachtests r=mw5h a=mw5h #### roachtest/import: refactor existing roachtests for import Previously, the roachtests for import were distressingly absent solid verification of the imported data. This patch changes those tests to use the newly revamed SHOW FINGERPRINTS to validate the imported data. Along the way, we attempt to standardize and rationalize the test design so that it's more easily extensible. As part of this work, we're moving away from using TPC-C data even though it most closely resembles OLTP workloads because it's much easier to validate the import of the static TPC-H data files. We keep the TPC-C benchmark because that's potentially interesting, but it's a separate thing for now. We also now standardize how we deal with local clusters by picking a scale factor during data set initialization. Local uses scale factor 1 and our four node tests use scale factor 100. The data set initializer has access to the cluster configuration, so we can select even larger scale factors for larger clusters in the future, if desired. Informs: #156816 Release note: None #### roachtest/import: add cancellation test to import Previously, import_cancellation was a separate test that imported the entire TPC-H dataset and then ran the TPC-H workload to verify that there were no errors. Unfortunately, the TPC-H workload does not verify the correctness of results (only the number of results), which means there could be import errors that go undetected. This patch brings the core import & cancel logic from the import-cancellation test into the import test as a custom test runner, which lets us use the validation logic already in the import test. For now we only import a single, random file but a future patch will select a random set of files to import to maintain the same coverage in the face of concurrent imports. Fixes: #156816 Release note: None 157845: build: reduce `shard_count` of `allccl_test` to 4 r=rail a=rickystewart This package only has 4 tests. Release note: none Epic: none Co-authored-by: Matt White <[email protected]> Co-authored-by: Ricky Stewart <[email protected]>
3 parents 15f5ccb + 69b26fd + 700f41e commit 62bb107

File tree

6 files changed

+604
-540
lines changed

6 files changed

+604
-540
lines changed

pkg/ccl/workloadccl/allccl/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ go_test(
4646
"main_test.go",
4747
],
4848
embed = [":allccl"],
49-
shard_count = 16,
49+
shard_count = 4,
5050
deps = [
5151
"//pkg/base",
5252
"//pkg/ccl",

pkg/cmd/roachtest/tests/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ go_library(
8888
"hibernate_blocklist.go",
8989
"hotspotsplits.go",
9090
"import.go",
91-
"import_cancellation.go",
9291
"inconsistency.go",
9392
"indexes.go",
9493
"inspect_throughput.go",

pkg/cmd/roachtest/tests/backup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ func runBackupMVCCRangeTombstones(
626626
require.NoError(t, err)
627627
_, err = conn.Exec(`USE tpch`)
628628
require.NoError(t, err)
629-
createStmt, err := readCreateTableFromFixture(
629+
createStmt, err := readFileFromFixture(
630630
"gs://cockroach-fixtures-us-east1/tpch-csv/schema/orders.sql?AUTH=implicit", conn)
631631
require.NoError(t, err)
632632
_, err = conn.ExecContext(ctx, createStmt)

0 commit comments

Comments
 (0)