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.2: kvcoord: fix error index in case of range split #113638

Merged
merged 1 commit into from
Nov 5, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Nov 1, 2023

Backport 1/1 commits from #113111 on behalf of @yuzefovich.

/cc @cockroachdb/release


This commit fixes the DistSender to set the correct error index in case an error is encountered after divideAndSendBatchToRanges was called recursively due to a stale range cache. In this scenario, previously we would have the error index set as if the original batch was the one right before the recursive call, which is incorrect in case that batch itself was split (e.g. because the original batch touched multiple ranges, and each sub-batch was executed in parallel). We already had the error index mapping code in place for the main code path, but we forgot to do the error index re-mapping after two recursive calls, which is now fixed.

This commit additionally pulls out the logic to set response.positions out of sendPartialBatch since there are fewer places to do that one level up.

This bug has been present for a very long time, but it seems relatively minor, so I decided to not include the release note.

Fixes: #111481.

Release note: None


Release justification: bug fix.

This commit fixes the DistSender to set the correct error index in case
an error is encountered after `divideAndSendBatchToRanges` was called
recursively due to a stale range cache. In this scenario, previously we
would have the error index set as if the original batch was the one
right before the recursive call, which is incorrect in case that batch
itself was split (e.g. because the original batch touched multiple
ranges, and each sub-batch was executed in parallel). We already had the
error index mapping code in place for the main code path, but we forgot
to do the error index re-mapping after two recursive calls, which is now
fixed.

This commit additionally pulls out the logic to set `response.positions`
out of `sendPartialBatch` since there are fewer places to do that one
level up.

This bug has been present for a very long time, but it seems relatively
minor, so I decided to not include the release note.

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner November 1, 2023 21:19
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-113111 branch 2 times, most recently from cfb79ad to 85591e1 Compare November 1, 2023 21:19
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 1, 2023
Copy link
Author

blathers-crl bot commented Nov 1, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Nov 1, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich
Copy link
Member

Friendly ping @nvanbenschoten

@yuzefovich yuzefovich merged commit 6148bf8 into release-23.2 Nov 5, 2023
2 checks passed
@yuzefovich yuzefovich deleted the blathers/backport-release-23.2-113111 branch November 5, 2023 02:20
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants