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: kv: consider ErrReplicaNotFound and ErrReplicaCannotHoldLease to be retryable #100955

Merged
merged 1 commit into from
Jun 6, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Apr 7, 2023

Backport 1/1 commits from #98116 on behalf of @nvanbenschoten.

Fixes #100984.

/cc @cockroachdb/release


Fixes #96746.
Fixes #100379.

This commit considers ErrReplicaNotFound and ErrReplicaCannotHoldLease to be retryable replication change errors when thrown by lease transfer requests. In doing so, these errors will be retried by the retry loop in Replica.executeAdminCommandWithDescriptor.

This avoids spurious errors when a split gets blocked behind a lateral replica move like we see in the following situation:

  1. issue AdminSplit
  2. range in joint config, first needs to leave (maybeLeaveAtomicChangeReplicas)
  3. to leave, needs to transfer lease from voter_outgoing to voter_incoming 4(a). lease transfer request sent to replica that has not yet applied the
    replication change that added the voter_incoming to the range
    4(b). lease transfer request delayed and delivered after voter_incoming has
    been transferred the lease, added to the range, then removed from the
    range.

In either case, retrying the AdminSplit operation on these errors will ensure that it eventually succeeds.

Release note (bug fix): Fixed a rare race that could allow large RESTOREs to fail with a unable to find store error.


Release justification: avoids errors during splits, which can be seen during IMPORT and RESTORE.

@blathers-crl blathers-crl bot requested a review from a team as a code owner April 7, 2023 20:27
@blathers-crl blathers-crl bot requested a review from a team April 7, 2023 20:27
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-98116 branch from 7e8c7c6 to 59fb953 Compare April 7, 2023 20:27
@blathers-crl blathers-crl bot requested review from nvanbenschoten and shralex April 7, 2023 20:27
@blathers-crl
Copy link
Author

blathers-crl bot commented Apr 7, 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?

@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Apr 7, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@github-actions
Copy link

Reminder: it has been 3 weeks please merge or close your backport!

…etryable

Fixes #96746.
Fixes #100379.

This commit considers ErrReplicaNotFound and ErrReplicaCannotHoldLease
to be retryable replication change errors when thrown by lease transfer
requests. In doing so, these errors will be retried by the retry loop in
`Replica.executeAdminCommandWithDescriptor`.

This avoids spurious errors when a split gets blocked behind a lateral
replica move like we see in the following situation:
1. issue AdminSplit
2. range in joint config, first needs to leave (maybeLeaveAtomicChangeReplicas)
3. to leave, needs to transfer lease from voter_outgoing to voter_incoming
4(a). lease transfer request sent to replica that has not yet applied the
      replication change that added the voter_incoming to the range
4(b). lease transfer request delayed and delivered after voter_incoming has
      been transferred the lease, added to the range, then removed from the
      range.

In either case, retrying the AdminSplit operation on these errors will
ensure that it eventually succeeds.

Release note (bug fix): Fixed a rare race that could allow large RESTOREs
to fail with a `unable to find store` error.
@nvanbenschoten nvanbenschoten force-pushed the blathers/backport-release-23.1-98116 branch from ce101e8 to e08ed28 Compare June 1, 2023 15:22
@nvanbenschoten nvanbenschoten requested a review from tbg June 1, 2023 19:07
@nvanbenschoten nvanbenschoten merged commit 59e3602 into release-23.1 Jun 6, 2023
@nvanbenschoten nvanbenschoten deleted the blathers/backport-release-23.1-98116 branch June 6, 2023 14:11
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. no-backport-pr-activity O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants