release-21.1: backupccl: mark type descs as dropped if there is a failure in restore #62454
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, when cleaning up type descriptors from a failed restore, we would directly delete the system.descriptor entry. This is bad because writing directly to the system.descriptor table means we bypass the descriptor collection, which doesn't know these descriptors have been dropped. The descriptor collection validates all uncommitted descriptors before writing them. As the descriptor collection doesn't know type descriptors have been dropped, validating cross references was always bound to fail. Put another way, if a restore from a backup which contained user defined types failed for any reason, we were bound to require manual cleanup. This patch fixes this problem by going through the descriptor collection and writing the descriptor in DROPPED state in addition to deleting the system.descriptor entry. Release note (bug fix): Fixed a bug where a failed restore from a backup including user defined types would require manual cleanup.
|
This change is |
pbardea
approved these changes
Mar 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 1/1 commits from #62278.
/cc @cockroachdb/release
Previously, when cleaning up type descriptors from a failed restore, we
would directly delete the system.descriptor entry. This is bad because
writing directly to the system.descriptor table means we bypass the
descriptor collection, which doesn't know these descriptors have been
dropped.
The descriptor collection validates all uncommitted descriptors before
writing them. As the descriptor collection doesn't know type
descriptors have been dropped, validating cross references was always
bound to fail. Put another way, if a restore from a backup which
contained user defined types failed for any reason, we were bound to
require manual cleanup.
This patch fixes this problem by going through the descriptor
collection and writing the descriptor in DROPPED state in addition to
deleting the system.descriptor entry.
Release note (bug fix): Fixed a bug where a failed restore from a
backup including user defined types would require manual cleanup.