Skip to content

catalogkv: fix panic inside Txn swallowing retries#67544

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
ajwerner:ajwerner/fix-panic-in-txn
Jul 14, 2021
Merged

catalogkv: fix panic inside Txn swallowing retries#67544
craig[bot] merged 1 commit intocockroachdb:masterfrom
ajwerner:ajwerner/fix-panic-in-txn

Conversation

@ajwerner
Copy link
Copy Markdown
Contributor

(*kv.DB).Txn may produce retry errors. While it's fine that this test
function can panic in the face of a real error, it's not okay to panic
the retry error.

Fixes #67213.

Release note: None

@ajwerner ajwerner requested a review from postamar July 13, 2021 16:51
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown

@postamar postamar left a comment

Choose a reason for hiding this comment

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

This is very uncontroversial! Thanks for doing this.

`(*kv.DB).Txn` may produce retry errors. While it's fine that this test
function can panic in the face of a real error, it's not okay to panic
the retry error.

Fixes cockroachdb#67213.

Release note: None
@ajwerner ajwerner force-pushed the ajwerner/fix-panic-in-txn branch from 5e58560 to 763d236 Compare July 13, 2021 21:00
@ajwerner
Copy link
Copy Markdown
Contributor Author

bors r=postamar

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 14, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 14, 2021

Build succeeded:

@craig craig bot merged commit 5a0b11e into cockroachdb:master Jul 14, 2021
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.

ccl/multiregionccl: TestIndexDescriptorUpdateForImplicitColumns failed

3 participants