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-21.1: kv: add to replicaGCQueue in replicaMsgAppDropper, not gcQueue #74124

Merged
merged 1 commit into from
Dec 22, 2021

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Dec 21, 2021

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

/cc @cockroachdb/release


Fixes #73838.

This commit is the first of the three "next steps" identified in #73838. It fixes a case where we were accidentally adding a replica to the wrong queue. When dropping a MsgApp in maybeDropMsgApp, we want to GC the replica on the LHS of the split if it has been removed from its range. However, we were instead passing it to the MVCC GC queue, which was both irrelevant and a no-op because the LHS was not the leaseholder.

It's possible that we have seen the effects of this in roachtests like splits/largerange. This but could have delayed a snapshot to the RHS of a split for up to maxDelaySplitTriggerTicks * 200ms = 20s in some rare cases. We've seen the logs corresponding to this issue in a few tests over the past year: https://github.com/cockroachdb/cockroach/issues?q=is%3Aissue+%22would+have+dropped+incoming+MsgApp+to+wait+for+split+trigger%22+is%3Aclosed.


Release justification: bug fix

Fixes #73838.

This commit is the first of the three "next steps" identified in #73838.
It fixes a case where we were accidentally adding a replica to the wrong
queue. When dropping a `MsgApp` in `maybeDropMsgApp`, we want to GC the
replica on the LHS of the split if it has been removed from its range.
However, we were instead passing it to the MVCC GC queue, which was both
irrelevant and also a no-op because the LHS was not the leaseholder.

It's possible that we have seen the effects of this in roachtests like
`splits/largerange`. This but could have delayed a snapshot to the RHS
of a split for up to `maxDelaySplitTriggerTicks * 200ms = 20s` in some
rare cases. We've seen the logs corresponding to this issue in a few
tests over the past year: https://github.com/cockroachdb/cockroach/issues?q=is%3Aissue+%22would+have+dropped+incoming+MsgApp+to+wait+for+split+trigger%22+is%3Aclosed.
@blathers-crl blathers-crl bot requested a review from a team as a code owner December 21, 2021 03:07
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-21.1-74073 branch from ad2bab8 to 6b5c240 Compare December 21, 2021 03:07
@blathers-crl blathers-crl bot requested a review from tbg December 21, 2021 03:07
@blathers-crl
Copy link
Author

blathers-crl bot commented Dec 21, 2021

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 Dec 21, 2021
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@nvanbenschoten nvanbenschoten merged commit fe0a299 into release-21.1 Dec 22, 2021
@nvanbenschoten nvanbenschoten deleted the blathers/backport-release-21.1-74073 branch December 22, 2021 16:27
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