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

backport-2.1: sql: fix flaky TestLeaseRenewedPeriodically #28965

Merged
merged 1 commit into from
Aug 31, 2018

Conversation

vivekmenezes
Copy link
Contributor

Backport 1/1 commits from #28954.

/cc @cockroachdb/release


I changed GossipUpdateEvent as well which is strictly not needed
but there is a chance without it there will continue to be
some flakiness.

This fix essentially moves the check for release counts
further up before lease acquisition. This fixes a race
where after lease acquisition the periodic timer would
fire, acquire/release some leases.

fixes #28771

Release note: None

@vivekmenezes vivekmenezes requested review from dt and a team August 22, 2018 17:08
@cockroach-teamcity
Copy link
Member

This change is Reviewable

I changed GossipUpdateEvent as well which is strictly not needed
but there is a chance without it there will continue to be
some flakiness.

This fix essentially moves the check for release counts
further up before lease acquisition. This fixes a race
where after lease acquisition the periodic timer would
fire, acquire/release some leases.

fixes cockroachdb#28771

Release note: None
@vivekmenezes
Copy link
Contributor Author

bors r+

craig bot pushed a commit that referenced this pull request Aug 31, 2018
28965: backport-2.1: sql: fix flaky TestLeaseRenewedPeriodically r=vivekmenezes a=vivekmenezes

Backport 1/1 commits from #28954.

/cc @cockroachdb/release

---

I changed GossipUpdateEvent as well which is strictly not needed
but there is a chance without it there will continue to be
some flakiness.

This fix essentially moves the check for release counts
further up before lease acquisition. This fixes a race
where after lease acquisition the periodic timer would
fire, acquire/release some leases.

fixes #28771

Release note: None


Co-authored-by: Vivek Menezes <[email protected]>
@craig
Copy link
Contributor

craig bot commented Aug 31, 2018

Build succeeded

@craig craig bot merged commit e91f931 into cockroachdb:release-2.1 Aug 31, 2018
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