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.

Sign up for GitHub

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

Jump to bottom

release-21.2: kv: remove dependency on ticks from maybeDropMsgApp #74204

Merged
merged 2 commits into from
Dec 23, 2021
Merged

release-21.2: kv: remove dependency on ticks from maybeDropMsgApp #74204

merged 2 commits into from
Dec 23, 2021

Conversation

nvanbenschoten
Copy link
Member

@nvanbenschoten nvanbenschoten commented Dec 22, 2021 •
edited
Loading

Backport 2/2 commits from #74108.

/cc @cockroachdb/release

Release justification: bug fix

Related to #73838.

In d77bee9, we stopped ticking uninitialized replicas, so we can no longer use ticks as a proxy for the age of a replica in the escape hatch of maybeDropMsgApp. Instead, we now use the age of the replica directly. We hit the escape hatch for any replica that is older than 20s, which corresponds to the 100 ticks we used before.

@nvanbenschoten
kv: plumb context into msgAppDropper.ShouldDrop
d3eb7c6 
Avoids the `context.Background` in `replicaMsgAppDropper.ShouldDrop`.
@nvanbenschoten
kv: remove dependency on ticks from maybeDropMsgApp
bf543d3 
Related to cockroachdb#73838.

In d77bee9, we stopped ticking uninitialized replicas, so we can no longer use
ticks as a proxy for the age of a replica in the escape hatch of `maybeDropMsgApp`.
Instead, we now use the age of the replica directly. We hit the escape hatch for
any replica that is older than 20s, which corresponds to the 100 ticks we used
before.
@nvanbenschoten nvanbenschoten requested a review from tbg December 22, 2021 16:28
@nvanbenschoten nvanbenschoten requested a review from a team as a code owner December 22, 2021 16:28
@blathers-crl
Copy link

blathers-crl bot commented Dec 22, 2021 •
edited by nvanbenschoten
Loading

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

@nvanbenschoten nvanbenschoten merged commit ec9330f into cockroachdb:release-21.2 Dec 23, 2021
@nvanbenschoten nvanbenschoten deleted the backport21.2-74108 branch January 6, 2022 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tbg tbg tbg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nvanbenschoten @cockroach-teamcity @tbg