Skip to content

release-25.4: persistedsqlstats: add WithCancelOnQuiesce to MaybeFlushWithDrainer#161177

Merged
kyle-a-wong merged 1 commit intocockroachdb:release-25.4from
kyle-a-wong:backport25.4-160403
Jan 15, 2026
Merged

release-25.4: persistedsqlstats: add WithCancelOnQuiesce to MaybeFlushWithDrainer#161177
kyle-a-wong merged 1 commit intocockroachdb:release-25.4from
kyle-a-wong:backport25.4-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:03
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Jan 15, 2026

Thanks for opening a backport.

Before merging, please confirm that it falls into one of the following categories (select one):

  • Non-production code changes. Includes test-only changes, build system changes, etc.
  • Fixes for serious issues. Defined in the policy as correctness, stability, or security issues, data corruption/loss, significant performance regressions, breaking working and widely used functionality, or an inability to detect and debug production issues.
  • Other approved changes. These changes must be gated behind a disabled-by-default feature flag unless there is a strong justification not to.

Add a brief release justification to the PR description explaining your selection.

Also, confirm that the change does not break backward compatibility and complies with all aspects of the backport policy.

All backports must be reviewed by the TL and EM for the owning area.

@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

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Jan 15, 2026

✅ PR #161177 is compliant with backport policy

Confidence: high
Critical bug criteria met: [Stability or security issues]
Backward compatible: true
Explanation: The pull request has a valid release justification which states it is a 'Low risk change that prevents slow quiesce during shutdowns.' This change can be classified as addressing a stability issue which is part of the critical bug criteria. The fix deals with shutdown operations, potentially resolving a stability problem during shutdown sequences, which justifies it as a critical bug fix. Furthermore, the PR does not introduce or remove feature flags nor does it show indications of breaking backward compatibility as the change is localized to handling shutdown sequences efficiently. Given these conditions, there is no need to assess feature flag inclusion separately in this case.

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

@kyle-a-wong kyle-a-wong merged commit af29537 into cockroachdb:release-25.4 Jan 15, 2026
27 of 28 checks passed
@kyle-a-wong kyle-a-wong deleted the backport25.4-160403 branch January 15, 2026 20:05
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 v25.4.4

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants