Skip to content

sql: avoid flake in scan_test#52769

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
jordanlewis:flake
Aug 18, 2020
Merged

sql: avoid flake in scan_test#52769
craig[bot] merged 1 commit intocockroachdb:masterfrom
jordanlewis:flake

Conversation

@jordanlewis
Copy link
Copy Markdown
Member

The new sqlliveness package doesn't get along well with the kv batch
size "atomic", so turn down its check frequency in the test. Possibly we
should make the "atomic" actually atomic, but I'm not sure about the
runtime performance change.

Fixes #52683

Release note: None

@jordanlewis jordanlewis requested a review from a team August 13, 2020 13:39
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@asubiotto asubiotto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An atomic should be fine in the grand scheme of things, but this solution :lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

Copy link
Copy Markdown
Contributor

@jbowens jbowens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this good to merge @jordanlewis? Seeing more of this failure today: #52683

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @jordanlewis)


pkg/sql/scan_test.go, line 175 at r1 (raw file):

	for _, batch := range batchSizes {
		row.TestingSetKVBatchSize(int64(batch))

accident?

The new sqlliveness package doesn't get along well with the kv batch
size "atomic", so turn down its check frequency in the test. Possibly we
should make the "atomic" actually atomic, but I'm not sure about the
runtime performance change.

Fixes cockroachdb#52683

Release note: None
@asubiotto
Copy link
Copy Markdown
Contributor

Jordan's out so merging this on his behalf

bors r=asubiotto

@jbowens
Copy link
Copy Markdown
Contributor

jbowens commented Aug 18, 2020

Thanks @asubiotto

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 18, 2020

Build succeeded:

@craig craig bot merged commit d1afb84 into cockroachdb:master Aug 18, 2020
@jordanlewis jordanlewis deleted the flake branch August 26, 2020 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

sql: TestScanBatches failed

4 participants