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.1: storage: encode ApproximateDiskBytes keys #100937

Merged
merged 1 commit into from
Apr 10, 2023

Conversation

blathers-crl[bot]
Copy link

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

Backport 1/1 commits from #100870 on behalf of @jbowens.

/cc @cockroachdb/release


Previously Engine.ApproximateDiskBytes accepted two roachpb.Keys for bounds which were passed directly to Pebble without additional encoding. When used with EngineCompare, Cockroach would incorrectly try to interpret the final byte as a version length. This could result in incorrect size calculations or ApproximateDiskBytes erroring on out-of-order span bounds.

Kudos to @THardy98 for uncovering this one.

Epic: None
Release note (bug fix): Fix a bug whereby some tables' physical disk space could not be calculated.


Release justification: Low-risk bug fix.

@blathers-crl blathers-crl bot requested a review from a team as a code owner April 7, 2023 18:22
@blathers-crl blathers-crl bot requested a review from jbowens April 7, 2023 18:22
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.1-100870 branch from f40e293 to d3d3874 Compare April 7, 2023 18:22
@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 force-pushed the blathers/backport-release-22.1-100870 branch from 1c03925 to 942cb50 Compare April 7, 2023 18:22
@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

Previously Engine.ApproximateDiskBytes accepted two roachpb.Keys for bounds
which were passed directly to Pebble without additional encoding. When used
with EngineCompare, Cockroach would incorrectly try to interpret the final byte
as a version length. This could result in incorrect size calculations or
ApproximateDiskBytes erroring on out-of-order span bounds.

Epic: None
Release note (bug fix): Fix a bug whereby some tables' physical disk space
could not be calculated.
@jbowens jbowens force-pushed the blathers/backport-release-22.1-100870 branch from 942cb50 to aa323c8 Compare April 7, 2023 19:56
@blathers-crl
Copy link
Author

blathers-crl bot commented Apr 7, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@jbowens
Copy link
Collaborator

jbowens commented Apr 10, 2023

TFTR!

@jbowens jbowens merged commit 5323881 into release-22.1 Apr 10, 2023
@jbowens jbowens deleted the blathers/backport-release-22.1-100870 branch April 10, 2023 13:59
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.

None yet

3 participants