10000 storage: fix flake in TestContendedIntentChangesOnRetry by nvanbenschoten · Pull Request #32864 · cockroachdb/cockroach · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

storage: fix flake in TestContendedIntentChangesOnRetry #32864

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Dec 5, 2018
Merged

storage: fix flake in TestContendedIntentChangesOnRetry #32864

merged 1 commit into from
Dec 5, 2018

Conversation

nvanbenschoten
Copy link
Contributor

Saw in CI of #32853.

We were ignoring deadlock errors on txn4, but not txn5.

Release note: None

@nvanbenschoten
storage: fix flake in TestContendedIntentChangesOnRetry
ad83301 
Saw in CI of cockroachdb#32853.

We were ignoring deadlock errors on txn4, but not txn5.

Release note: None
@nvanbenschoten nvanbenschoten requested a review from a team December 5, 2018 19:29
@cockroach-teamcity
Copy link
Member

This change is Reviewable

andreimatei
andreimatei reviewed Dec 5, 2018
View reviewed changes
Copy link
Contributor
@andreimatei andreimatei left a comment

Choose a reason for hiding this comment

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

LGTM

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

@nvanbenschoten
Copy link
Contributor Author

TFTR!

bors r+

@nvanbenschoten nvanbenschoten mentioned this pull request Dec 5, 2018
Merged
craig bot pushed a commit that referenced this pull request Dec 5, 2018
@nvanbenschoten
Merge #32864
5e0f20f 
32864: storage: fix flake in TestContendedIntentChangesOnRetry r=nvanbenschoten a=nvanbenschoten

Saw in CI of #32853.

We were ignoring deadlock errors on txn4, but not txn5.

Release note: None

Co-authored-by: Nathan VanBenschoten <nvanbenschoten@gmail.com>
@craig
Copy link
Contributor
craig bot commented Dec 5, 2018

Build succeeded

@craig craig bot merged commit ad83301 into cockroachdb:master Dec 5, 2018
@nvanbenschoten nvanbenschoten deleted the nvanbenschoten/fixFlake branch December 5, 2018 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andreimatei andreimatei andreimatei left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nvanbenschoten @cockroach-teamcity @andreimatei
0