Skip to content

importccl: account for the RowSource return constraint#59115

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
irfansharif:210118.fix-import-processor
Jan 19, 2021
Merged

importccl: account for the RowSource return constraint#59115
craig[bot] merged 1 commit intocockroachdb:masterfrom
irfansharif:210118.fix-import-processor

Conversation

@irfansharif
Copy link
Copy Markdown
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 a team, pbardea and yuzefovich January 18, 2021 20:51
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@pbardea
Copy link
Copy Markdown
Contributor

pbardea commented Jan 19, 2021

Thanks!

@irfansharif
Copy link
Copy Markdown
Contributor Author

TFTR!

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 19, 2021

Build failed:

@irfansharif
Copy link
Copy Markdown
Contributor Author

TestDockerJava/runMode=docker

bors r+

@craig
Copy link
Copy Markdown
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