Skip to content

catalog/lease: deflake TestDescriptorRefreshOnRetry#137059

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:deflake-TestDescriptorRefreshOnRetry
Dec 10, 2024
Merged

catalog/lease: deflake TestDescriptorRefreshOnRetry#137059
craig[bot] merged 1 commit intocockroachdb:masterfrom
rafiss:deflake-TestDescriptorRefreshOnRetry

Conversation

@rafiss
Copy link
Collaborator

@rafiss rafiss commented Dec 9, 2024

The test was flaky since the background thread to refresh leases could run and cause the acquisition counts to be off.

fixes #137033
Release note: None

The test was flaky since the background thread to refresh leases could
run and cause the acquisition counts to be off.

Release note: None
@rafiss rafiss added backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only backport-23.2.x PAST MAINTENANCE SUPPORT: 23.2 patch releases via ER request only backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x backport-24.3.x Flags PRs that need to be backported to 24.3 labels Dec 9, 2024
@rafiss rafiss requested a review from spilchen December 9, 2024 23:08
@rafiss rafiss requested a review from a team as a code owner December 9, 2024 23:08
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@spilchen spilchen left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @rafiss)

@rafiss
Copy link
Collaborator Author

rafiss commented Dec 10, 2024

tftr!

bors r+

@craig
Copy link
Contributor

craig bot commented Dec 10, 2024

Build failed (retrying...):

@craig craig bot merged commit 95d95a6 into cockroachdb:master Dec 10, 2024
@blathers-crl
Copy link

blathers-crl bot commented Dec 10, 2024

Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches.


Issue #137033: branch-release-23.1, branch-release-24.1, branch-release-24.2, branch-release-24.3.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@blathers-crl
Copy link

blathers-crl bot commented Dec 10, 2024

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 67b1c9c to blathers/backport-release-23.1-137059: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


error creating merge commit from 67b1c9c to blathers/backport-release-23.2-137059: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-23.1.x PAST MAINTENANCE SUPPORT: 23.1 patch releases via ER request only backport-23.2.x PAST MAINTENANCE SUPPORT: 23.2 patch releases via ER request only backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.3.x Flags PRs that need to be backported to 24.3

Projects

None yet

Development

Successfully merging this pull request may close these issues.

sql/catalog/lease: TestDescriptorRefreshOnRetry failed

3 participants