Skip to content

release-25.4: sql/importer: cap metamorphic batch sizes in TestImportCSVStmt#170140

Merged
trunk-io[bot] merged 1 commit into
cockroachdb:release-25.4from
DrewKimball:backport25.4-170013
May 12, 2026
Merged

release-25.4: sql/importer: cap metamorphic batch sizes in TestImportCSVStmt#170140
trunk-io[bot] merged 1 commit into
cockroachdb:release-25.4from
DrewKimball:backport25.4-170013

Conversation

@DrewKimball
Copy link
Copy Markdown
Collaborator

Backport 1/1 commits from #170013.

/cc @cockroachdb/release


The test has been timing out under metamorphic builds when kv-batch-size and datum-row-converter-batch-size are randomized to their minimum (1). With 18 subtests sharing one cluster, those values blow through the 15-minute package timeout.

Override both to 10 in the test setup. Adds TestingRaiseDefaultKVBatchSize to pkg/sql/row since kv-batch-size had no testing setter; the existing TestingSetDatumRowConverterBatchSize covers the other.

Local timing with both constants forced to 1 vs 10: 74.6s -> 28.2s.

Fixes: #167087
Release note: None


Release justification: test-only change

The test has been timing out under metamorphic builds when
`kv-batch-size` and `datum-row-converter-batch-size` are randomized
to their minimum (1). With 18 subtests sharing one cluster, those
values blow through the 15-minute package timeout.

Override both to 10 in the test setup. Adds TestingRaiseDefaultKVBatchSize
to pkg/sql/row since `kv-batch-size` had no testing setter; the
existing TestingSetDatumRowConverterBatchSize covers the other.

Local timing with both constants forced to 1 vs 10: 74.6s -> 28.2s.

Fixes: cockroachdb#167087
Release note: None
@DrewKimball DrewKimball requested a review from mw5h May 11, 2026 16:58
@DrewKimball DrewKimball requested review from a team as code owners May 11, 2026 16:58
@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented May 11, 2026

Thanks for opening a backport.

Before merging, please confirm that it falls into one of the following categories (select one):

  • Non-production code changes OR fixes for serious issues. Non-production includes test-only changes, build system changes, etc. Serious issues are defined in the policy as correctness, stability, or security issues, data corruption/loss, significant performance regressions, breaking working and widely used functionality, or an inability to detect and debug production issues.
  • Other approved changes. These changes must be gated behind a disabled-by-default feature flag unless there is a strong justification not to. Reference the approved ENGREQ ticket in the PR body (e.g., "Fixes ENGREQ-123").

Add a brief release justification to the PR description explaining your selection.

Also, confirm that the change does not break backward compatibility and complies with all aspects of the backport policy.

All backports must be reviewed by the TL and EM for the owning area.

@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io Bot commented May 11, 2026

😎 Merged successfully - details.

@blathers-crl blathers-crl Bot added backport Label PR's that are backports to older release branches T-sql-queries SQL Queries Team labels May 11, 2026
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented May 11, 2026

Detected infrastructure failure (matched: self-hosted runner lost communication with the server). Automatically rerunning failed jobs. (run link)

@DrewKimball
Copy link
Copy Markdown
Collaborator Author

TFTR

/trunk merge

@trunk-io trunk-io Bot merged commit e15b0f6 into cockroachdb:release-25.4 May 12, 2026
29 of 30 checks passed
@DrewKimball DrewKimball deleted the backport25.4-170013 branch May 12, 2026 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Label PR's that are backports to older release branches T-sql-queries SQL Queries Team target-release-25.4.11

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants