Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

importccl: account for the RowSource return constraint #59115

Merged
merged 1 commit into from
Jan 19, 2021

Conversation

irfansharif
Copy link
Contributor

...in the import processor. The contract of RowSource.Next requires
that at most one of the return values will be non-empty. This wasn't the
case here, and caused opaque failures in #58897. #58897 tries to enable
background tracing by default, which for us means that the trailing meta
can be non-empty (they'll contain span recordings). That behaviour ends
up tickling this bug, tripping up TestCSVImportCanBeResumed.

Release note: None

...in the import processor. The contract of `RowSource.Next` requires
that at most one of the return values will be non-empty. This wasn't the
case here, and caused opaque failures in cockroachdb#58897. cockroachdb#58897 tries to enable
background tracing by default, which for us means that the trailing meta
can be non-empty (they'll contain span recordings). That behaviour ends
up tickling this bug, tripping up TestCSVImportCanBeResumed.

Release note: None
@irfansharif irfansharif requested review from pbardea, yuzefovich and a team January 18, 2021 20:51
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@pbardea
Copy link
Contributor

pbardea commented Jan 19, 2021

Thanks!

@irfansharif
Copy link
Contributor Author

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Jan 19, 2021

Build failed:

@irfansharif
Copy link
Contributor Author

TestDockerJava/runMode=docker

bors r+

@craig
Copy link
Contributor

craig bot commented Jan 19, 2021

Build succeeded:

@craig craig bot merged commit 8451341 into cockroachdb:master Jan 19, 2021
@irfansharif irfansharif deleted the 210118.fix-import-processor branch January 19, 2021 18:23
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.

3 participants