Skip to content

Conversation

@rharding6373
Copy link
Collaborator

@rharding6373 rharding6373 commented Jan 30, 2026

Backport 1/1 commits from #162058 on behalf of @rharding6373.


Added a missing context check to handleBufferedRetries.

Epic: none
Fixes: #131223

Release note (bug fix): Fixes a bug in kafka v1 where a changefeed could potentially hang if the changefeed was shutting down.


Release justification: Low-risk change to fix a potential hang in a deprecated feature.

Added a missing context check to handleBufferedRetries.

Epic: none
Fixes: cockroachdb#131223

Release note (bug fix): Fixes a bug in kafka v1 where a changefeed
could potentially hang if the changefeed was shutting down.
@rharding6373 rharding6373 requested a review from a team as a code owner January 30, 2026 23:46
@rharding6373 rharding6373 requested review from andyyang890 and removed request for a team January 30, 2026 23:46
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jan 30, 2026
@blathers-crl blathers-crl bot requested a review from jeffswenson January 30, 2026 23:46
@blathers-crl
Copy link

blathers-crl bot commented Jan 30, 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-cdc labels Jan 30, 2026
@blathers-crl
Copy link

blathers-crl bot commented Jan 30, 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.

@blathers-crl
Copy link

blathers-crl bot commented Jan 30, 2026

✅ PR #162118 is compliant with backport policy

Confidence: high
Critical bug criteria met: [Stability or security issues]
Backward compatible: true
Explanation: The PR adds a missing context check to the Kafka v1 changefeed, which prevents a potential hang during changefeed shutdown. This change qualifies as fixing a critical bug related to stability issues under the 'Stability or security issues' criterion. Given that it addresses a specific bug that can affect the stability of the database, it is exempt from the feature flag requirement. The PR contains a proper release justification, describing it as a 'Low-risk change to fix a potential hang in a deprecated feature', making it clear why the backport is necessary despite it being for a deprecated feature. The file involved, 'sink_kafka.go', does not fall under any non-production category, but the nature of the fix is indeed critical as per the definitions provided.

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

@cockroach-teamcity
Copy link
Member

This change is Reviewable

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 blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. T-cdc

2 participants