backupccl: target offline importing tables if flag is set#85979
Closed
msbutler wants to merge 1 commit intocockroachdb:masterfrom
Closed
backupccl: target offline importing tables if flag is set#85979msbutler wants to merge 1 commit intocockroachdb:masterfrom
msbutler wants to merge 1 commit intocockroachdb:masterfrom
Conversation
Member
|
This change is |
d9ff717 to
ef2df29
Compare
Collaborator
Author
|
RFAL! only the latest commit is relevant, the current test failures are unrelated (#85350 (comment)) |
ef2df29 to
431982b
Compare
msbutler
commented
Aug 11, 2022
msbutler
commented
Aug 12, 2022
pkg/ccl/backupccl/testdata/backup-restore/backup-dropped-descriptors-declarative
Show resolved
Hide resolved
acc0df1 to
4560fb2
Compare
Historically, offline tables were excluded from backups (e.g. restoring or importing tables) because incremental backups could not reason correctly about their MVCC history. Now that all within tenant operations are now MVCC, BACKUP can begin incrementally backing up offline tables. Independent of the MVCC history thread, cockroachdb#83915 allowed backup to implicitly target _all_ offline descriptors (e.g. database, schema, table, type) to account for a class of compound online schema changes. This is a regression from the expected backup behavior and will get reverted in future work. This patch ensures that offline tables with importing data are not targetted iff an external flag is set. This patch merely refactors the internal targeting logic in backupresolver.ResolveTargetsToDescriptors, and does not change how backups behave. In other words, after this patch, no offline descriptors will get targeted, as all callers set the function's backupImports flag to false. A future PR will change these callsites. Informs cockroachdb#76722 Release note: none Release note (<category, see below>): <what> <show> <why>
4560fb2 to
f32c8fc
Compare
Collaborator
Author
|
This new diff will only target in-progress imports iff an external flag is set. It doesn't change the behavior of any other kinds of offline descriptors; therefore, this diff is quite low impact. I realized that I needed to modify targets.go in order to RESTORE TABLE with an in-flight import correctly. @ajwerner We can delay this PR until after you refactor the schema changer to not depend on the offline state. Ideally, I can slip this in, so I can avoid doing duplicate implementation work. |
Collaborator
Author
|
Closing for now. We can figure out how to filter offline descriptors in restore properly without modify DescMatchingTargets. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Historically, offline tables were excluded from backups (e.g. restoring or
importing tables) because incremental backups could not reason correctly about
their MVCC history. Now that all within tenant operations are now MVCC, BACKUP
can begin incrementally backing up offline tables.
Independent of the MVCC history thread, #83915 allowed backup to implicitly
target all offline descriptors (e.g. database, schema, table, type) to
account for a class of compound online schema changes. This is a regression
from the expected backup behavior and will get reverted in future work.
This patch ensures that offline tables with importing data are not targetted
iff an external flag is set.
This patch merely refactors the internal targeting logic in
backupresolver.ResolveTargetsToDescriptors, and does not change how backups
behave. In other words, after this patch, no offline descriptors will get
targeted, as all callers set the function's backupImports flag to false. A
future PR will change these callsites.
Informs #76722
Release note: none
Release justification: low risk change to a codepath that does not currently get called in production