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

release-23.1: c2c: fix rangefeed error propogration race #103014

Merged
merged 1 commit into from
May 11, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented May 10, 2023

Backport 1/1 commits from #102876 on behalf of @msbutler.

/cc @cockroachdb/release


In the producer dist sql processor, rangefeed errors only propograte to the user if the error can be sent on a non-blocking channel. Because the channel was previously unbuffered, the dist sql processor would inadvertently swallow the error if the receiver was not actively waiting on the channel. This would then cause the sql processor to hang, as the underlying rangefeed would close after the ignored error message.

This patch buffers the errCh, guaranteeing that the first rangefeed error will be processed by the sql processor. If the rangefeed surfaces several errors while the buffered channel is full, these errors will be swallowed, which is fine, as the first error will always shut down the sql processor.

Fixes #102286

Release note: None


Release justification: bug fix

@blathers-crl blathers-crl bot requested a review from a team as a code owner May 10, 2023 12:50
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-102876 branch from 25b297d to 010d02c Compare May 10, 2023 12:50
@blathers-crl blathers-crl bot requested review from lidorcarmel and removed request for a team May 10, 2023 12:50
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels May 10, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-102876 branch from 4fff272 to 5bf77db Compare May 10, 2023 12:50
@blathers-crl
Copy link
Author

blathers-crl bot commented May 10, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

In the producer dist sql processor, rangefeed errors only propograte to the
user if the error can be sent on a non-blocking channel. Because the channel
was previously unbuffered, the dist sql processor would inadvertently swallow
the error if the receiver was not actively waiting on the channel. This would
then cause the sql processor to hang, as the underlying rangefeed would close
after the ignored error message.

This patch buffers the errCh, guaranteeing that the first rangefeed
error will be processed by the sql processor. If the rangefeed surfaces several
errors while the buffered channel is full, these errors will be swallowed,
which is fine, as the first error will always shut down the sql processor.

Fixes #102286

Release note: None
@msbutler msbutler force-pushed the blathers/backport-release-23.1-102876 branch from 5bf77db to 1f3b575 Compare May 11, 2023 17:00
@msbutler msbutler merged commit f274852 into release-23.1 May 11, 2023
@msbutler msbutler deleted the blathers/backport-release-23.1-102876 branch May 11, 2023 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants