Skip to content

backupccl: stop including system db as complete in full cluster backup#47092

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
pbardea:full-cluster-rev-history
Apr 7, 2020
Merged

backupccl: stop including system db as complete in full cluster backup#47092
craig[bot] merged 1 commit intocockroachdb:masterfrom
pbardea:full-cluster-rev-history

Conversation

@pbardea
Copy link
Copy Markdown
Contributor

@pbardea pbardea commented Apr 6, 2020

When we perform a full-cluster backup we were including the system
database as a "complete database", however full cluster backup only
backs up a subset of the tables in the system table.

This led to bugs around taking several backups with revision history
since we would look for changes in all table descriptors for system
tables, but we should have only been looking for differences in system
tables that were backed up.

Fixes #47050.

Release justification: fixes release blocker.
Release note (bug fix): in some cases where system tables have changed,
incremental, full-cluster BACKUPs with revision history were sometimes
incorrectly disallowed.

@pbardea pbardea requested a review from dt April 6, 2020 20:30
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@pbardea pbardea force-pushed the full-cluster-rev-history branch from ef3801b to f7033c6 Compare April 7, 2020 04:54
@pbardea
Copy link
Copy Markdown
Contributor Author

pbardea commented Apr 7, 2020

I want to eventually follow this up with automated testing, but want that testing to be such that it generally exercises backups with revision history in general. I've tested that it fixes the issue with manual testing and don't want the automated testing to hold up the RC. Merging this as is for now.

TFTR!
bors r=dt

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 7, 2020

Already running a review

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Apr 7, 2020

❌ The GitHub CI (Cockroach) build has failed on f7033c60.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. I am experimental - my owner is otan.

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 7, 2020

Build failed

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Apr 7, 2020

❌ The GitHub CI (Cockroach) build has failed on f7033c60.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. I am experimental - my owner is otan.

When we perform a full-cluster backup we were including the system
database as a "complete database", however full cluster backup only
backs up a subset of the tables in the system table.

This led to bugs around taking several backups with revision history
since we would look for changes in all table descriptors for system
tables, but we should have only been looking for differences in system
tables that were backed up.

Release justification: fixes release blocker.
Release note (bug fix): in some cases where system tables have changed,
incremental, full-cluster BACKUPs with revision history were sometimes
incorrectly disallowed.
@pbardea pbardea force-pushed the full-cluster-rev-history branch from f7033c6 to ee6a8fd Compare April 7, 2020 14:33
@pbardea
Copy link
Copy Markdown
Contributor Author

pbardea commented Apr 7, 2020

Hit some flakes, let's try again
bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 7, 2020

Build failed (retrying...)

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 7, 2020

Build succeeded

@craig craig bot merged commit 51488a0 into cockroachdb:master Apr 7, 2020
@pbardea pbardea deleted the full-cluster-rev-history branch April 27, 2020 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants