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: catalog: don't set modification time for offline descriptors #112757

Merged
merged 1 commit into from Oct 23, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Oct 20, 2023

Backport 1/1 commits from #111820 on behalf of @rafiss.

/cc @cockroachdb/release


There is a post-deserialization change that automatically sets the
modification time for all descriptors if it is not present. Notably,
there is also a cluster upgrade step that rewrites all descriptors with
post-deserialization changes, and bumps their version.

If a RESTORE is running during an upgrade, the descriptors it tries to
rewrite could have been also bumped by the upgrade step. That
would cause the RESTORE to fail.

Now, the change to automatically set the modification time is disabled
if the descriptor is on the offline state, as it is during RESTORE.

fixes #109976

Release note (bug fix): Fixed a bug that could prevent RESTORE from
working if it was performed during a cluster upgrade.


Release justification: bug fix

@blathers-crl blathers-crl bot requested review from a team as code owners October 20, 2023 15:20
@blathers-crl blathers-crl bot requested review from adityamaru and removed request for a team October 20, 2023 15:20
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-22.2-111820 branch from b20729b to 90c8dcf Compare October 20, 2023 15:20
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Oct 20, 2023
@blathers-crl
Copy link
Author

blathers-crl bot commented Oct 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

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Oct 20, 2023
There is a post-deserialization change that automatically sets the
modification time for all descriptors if it is not present. Notably,
there is also a cluster upgrade step that rewrites all descriptors with
post-deserialization changes, and bumps their version.

If a RESTORE is running during an upgrade, the descriptors it tries to
rewrite could have been also bumped by the upgrade step. That
would cause the RESTORE to fail.

Now, the change to automatically set the modification time is disabled
if the descriptor is on the offline state, as it is during RESTORE.

Release note (bug fix): Fixed a bug that could prevent RESTORE from
working if it was performed during a cluster upgrade.
@rafiss rafiss force-pushed the blathers/backport-release-22.2-111820 branch from 90c8dcf to 0a48a60 Compare October 20, 2023 16:00
@rafiss rafiss requested a review from dt October 20, 2023 16:27
@rafiss
Copy link
Collaborator

rafiss commented Oct 20, 2023

Are all of the changes protected via a flag or option, new syntax, an environment variable or default-disabled cluster setting?

No, since this is a bug fix.

What are the risks to backporting this change? Can the risks of backporting be mitigated? What are the risks to not backporting?

Risk of backporting: Something during the RESTORE process may have been relying on the ModificationTime being set without us knowing.
Risk of not backporting: RESTOREs during upgrades can fail; the corresponding test will keep flaking.

Does this change really need to be backported? Or can it reasonably wait until the next major release to be addressed?

If we want to fix the bug and the test, then yes it needs to be.

@rafiss rafiss merged commit c7662ca into release-22.2 Oct 23, 2023
5 of 6 checks passed
@rafiss rafiss deleted the blathers/backport-release-22.2-111820 branch October 23, 2023 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches 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

4 participants