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

kv: deflake TestAdminDecommissionedOperations by setting server.shutdown.query_wait #108227

Merged

Conversation

nvanbenschoten
Copy link
Member

Fixes #107875.

This commit deflakes TestAdminDecommissionedOperations by setting the server.shutdown.query_wait cluster setting to 0s. This ensures that SQL queries are immediately canceled during the drain, instead of being let run for up to 10s (the previous test timeout) before cancellation.

The commit also increases the timeouts in the test to the default testutils timeouts, to avoid flakes when CI is slow.

Release note: None

@nvanbenschoten nvanbenschoten added backport-22.2.x backport-23.1.x Flags PRs that need to be backported to 23.1 labels Aug 4, 2023
@nvanbenschoten nvanbenschoten requested a review from knz August 4, 2023 23:43
@cockroach-teamcity
Copy link
Member

This change is Reviewable

…own.query_wait

Fixes cockroachdb#107875.

This commit deflakes `TestAdminDecommissionedOperations` by setting the
`server.shutdown.query_wait` cluster setting to 0s. This ensures that
SQL queries are immediately cancelled during the drain, instead of being
let run for up to 10s (the previous test timeout) before cancellation.

The commit also increases the timeouts in the test to the default
`testutils` timeouts, to avoid flakes when CI is slow.

Release note: None
@nvanbenschoten nvanbenschoten force-pushed the nvanbenschoten/deflake107875 branch from a321be7 to 73f540d Compare August 9, 2023 14:23
@nvanbenschoten
Copy link
Member Author

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Aug 9, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Aug 9, 2023

Build succeeded:

@craig craig bot merged commit 2c650af into cockroachdb:master Aug 9, 2023
@blathers-crl
Copy link

blathers-crl bot commented Aug 9, 2023

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 73f540d to blathers/backport-release-22.2-108227: 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 22.2.x failed. See errors above.


error creating merge commit from 73f540d to blathers/backport-release-23.1-108227: 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.


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

@nvanbenschoten nvanbenschoten deleted the nvanbenschoten/deflake107875 branch August 9, 2023 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pkg/server/storage_api/storage_api_test: TestAdminDecommissionedOperations failed
3 participants