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: storage: Fix GCBytesAge in CheckSSTConflicts with range keys #88783

Merged
merged 1 commit into from
Nov 10, 2022

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 27, 2022

Backport 1/1 commits from #88578 on behalf of @itsbilal.

/cc @cockroachdb/release


Change #87303 fixed GCBytesAge in CheckSSTConflicts for points, but not for range keys. This change fixes it for range keys too, by ensuring the changes to statsDiff happen at the right timestamp using statsDiff.AgeTo.

Fixes #82920.

Release note: None.


Release justification: fixes bug in MVCC stats update.

Change #87303 fixed GCBytesAge in `CheckSSTConflicts` for
points, but not for range keys. This change fixes it for
range keys too, by ensuring the changes to statsDiff happen
at the right timestamp using statsDiff.AgeTo.

Fixes #82920.

Release note: None.
@blathers-crl blathers-crl bot requested review from a team as code owners September 27, 2022 02:19
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-88578 branch from 066d4e4 to 442a895 Compare September 27, 2022 02:19
@blathers-crl blathers-crl bot requested a review from erikgrinaker September 27, 2022 02:19
@blathers-crl
Copy link
Author

blathers-crl bot commented Sep 27, 2022

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 Sep 27, 2022
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Contributor

@erikgrinaker erikgrinaker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The backport freeze went into effect yesterday, so I'm afraid this will have to wait until 22.2.1. We're not currently expecting SSTs with CheckSSTConflicts to contain range keys anyway, so that seems fine, and if we were to start using them in mixed 23.1/22.2.0 clusters then a stats mismatch isn't the end of the world.

@github-actions
Copy link

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

@erikgrinaker
Copy link
Contributor

erikgrinaker commented Oct 18, 2022

I think we can get this merged now @itsbilal.

@github-actions
Copy link

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

@erikgrinaker
Copy link
Contributor

I'm gonna go ahead and merge this.

@erikgrinaker erikgrinaker merged commit 97c6d50 into release-22.2 Nov 10, 2022
@erikgrinaker erikgrinaker deleted the blathers/backport-release-22.2-88578 branch November 10, 2022 10:10
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