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: revert slim manifests #99066

Merged
merged 4 commits into from
Mar 21, 2023

Conversation

rhu713
Copy link
Contributor

@rhu713 rhu713 commented Mar 20, 2023

This patch reverts all of the commits from the slim manifests 22.2 backport.

Fixes #98779

Release note: Revert a series of changes, introduced in 22.2.6, in which a restore job that was retried or resumed after being paused could fail to correctly restore some rows.

Release justification: reverts a patch that introduced a bug in restore that causes some files to be missed on resume

@blathers-crl
Copy link

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

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rhu713 rhu713 marked this pull request as ready for review March 20, 2023 21:10
@rhu713 rhu713 requested review from a team as code owners March 20, 2023 21:10
@rhu713 rhu713 requested review from dt and michae2 and removed request for a team and michae2 March 20, 2023 21:10
Rui Hu added 4 commits March 21, 2023 15:14
…-simple-import-spans"

This reverts commit 3a831a5, reversing
changes made to 2d59152.
…me-bug"

This reverts commit 740f055, reversing
changes made to 3a831a5.
…emove-generics"

This reverts commit d7283d9, reversing
changes made to 1e8e8dc.
…-93997-94805-96313-96529-96302-96245"

This reverts commit b9fbeca, reversing
changes made to c390c0c.
@rhu713 rhu713 force-pushed the 22.2-slim-manifest-revert branch from f7e0c32 to c0bd21b Compare March 21, 2023 15:24
@msbutler msbutler self-requested a review March 21, 2023 18:55
@rhu713 rhu713 merged commit 0e9addc into cockroachdb:release-22.2 Mar 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants