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-22.2: kvserver: rangefeeds check span validity before settings #97659

Merged
merged 1 commit into from
Mar 8, 2023

Conversation

AlexTalks
Copy link
Contributor

@AlexTalks AlexTalks commented Feb 24, 2023

Backport 1/1 commits from #97212.

/cc @cockroachdb/release

Release Justification: Bug fix for issue during upgrade.


Previously, rangefeed requests checked the rangefeed enabled cluster setting, or the RangefeedEnabled override from the SpanConfig intended for ranges on system tables, prior to checking if the request's span was actually in the range. This meant that if a DistSender's range cache was outdated, it could end up sending a rangefeed request to the wrong range and never get the RangeKeyMismatchError needed to evict the routing information from the cache, if the outdated range did not have that override enabled.

Fixes #95177.

Release note: None

@AlexTalks AlexTalks requested a review from a team as a code owner February 24, 2023 22:57
@blathers-crl
Copy link

blathers-crl bot commented Feb 24, 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

@AlexTalks AlexTalks force-pushed the backport22.2-97212 branch 2 times, most recently from 7988eac to 268833a Compare March 7, 2023 22:28
Previously, rangefeed requests checked the rangefeed enabled cluster
setting, or the `RangefeedEnabled` override from the `SpanConfig`
intended for ranges on system tables, prior to checking if the request's
span was actually in the range. This meant that if a DistSender's range
cache was outdated, it could end up sending a rangefeed request to the
wrong range and never get the `RangeKeyMismatchError` needed to evict
the routing information from the cache, if the outdated range did not
have that override enabled.

Fixes cockroachdb#95177.

Release note (bug fix): Since 22.1 when rangefeed enablement overrides
in span configs were introduced, rangefeed requests that reached spans
outside the range would not cause range cache invalidation due to the
setting being checked first, thus requests could repeatedly hit the same
incorrect range, causing errors until cache invalidation or node
restart. This fix correctly checks that the span is within the range
prior to checking the enablement settings, thus invalidating the cache
when a request reaches an incorrect range and causing subsequent
requests to successfully reach the correct range.
@AlexTalks AlexTalks merged commit febfc5e into cockroachdb:release-22.2 Mar 8, 2023
@AlexTalks AlexTalks deleted the backport22.2-97212 branch March 8, 2023 01:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants