Skip to content

release-26.1: persistedsqlstats: add WithCancelOnQuiesce to MaybeFlushWithDrainer#161176

Merged
kyle-a-wong merged 1 commit intocockroachdb:release-26.1from
kyle-a-wong:backport26.1-160403
Jan 15, 2026
Merged

release-26.1: persistedsqlstats: add WithCancelOnQuiesce to MaybeFlushWithDrainer#161176
kyle-a-wong merged 1 commit intocockroachdb:release-26.1from
kyle-a-wong:backport26.1-160403

Conversation

@kyle-a-wong
Copy link
Copy Markdown
Contributor

Backport 1/1 commits from #160403.

/cc @cockroachdb/release


use context from stopper.WithCancelOnQuiesce(ctx) to prevent slow slow quiesce during shutdown

Epic: None
Fixes: #159467
Release note: None

Release Justification: Low risk change that prevents slow quiesce during shutdowns. This has been seen in 25.4 (#161060), so we are backporting.

use context from stopper.WithCancelOnQuiesce(ctx) to prevent slow
slow quiesce during shutdown

Epic: None
Fixes: cockroachdb#159467
Release note: None
@kyle-a-wong kyle-a-wong requested a review from a team as a code owner January 15, 2026 17:01
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Jan 15, 2026

Thanks for opening a backport.

Before merging, please confirm that the change does not break backwards compatibility and otherwise complies with the backport policy. Include a brief release justification in the PR description explaining why the backport is appropriate. All backports must be reviewed by the TL for the owning area. While the stricter LTS policy does not yet apply, please exercise judgment and consider gating non-critical changes behind a disabled-by-default feature flag when appropriate.

@blathers-crl blathers-crl bot added backport Label PR's that are backports to older release branches T-observability labels Jan 15, 2026
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Jan 15, 2026

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

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

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@kyle-a-wong kyle-a-wong merged commit 81ebd2a into cockroachdb:release-26.1 Jan 15, 2026
26 of 29 checks passed
@kyle-a-wong kyle-a-wong deleted the backport26.1-160403 branch January 15, 2026 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Label PR's that are backports to older release branches T-observability v26.1.0-prerelease

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants