backupccl: fix codec selection during restore #116316
Conversation
Previously, the codec selection logic only looked at a single manifest to determine whether the backup data requires a system or tenant codec to be read. In older release branches if the full backup was empty (but a subsequent incremental was not) then we could incorrectly use a system codec for a backup that actually required a tenant codec. To fix this we now process all the manifests in the backup chain and use the first non-empty manifest. Fixes: cockroachdb#115773 Release note(bug fix): an empty full backup, followed by non-empty incrementals taken inside an application tenant may be unrestoreable because of the use of an incorrect SQL codec
|
This change is |
adityamaru
added
backport-23.1.x
| }, | ||
| expectedCodec: keys.SystemSQLCodec, | ||
| }, | ||
| } { |
| sqlDB.Exec(t, "CREATE TABLE create_and_drop.a (k int, v string)") | ||
| sqlDB.Exec(t, "INSERT INTO create_and_drop.a VALUES (1, 'foo')") | ||
| sqlDB.QueryRow(t, "SELECT cluster_logical_timestamp()").Scan(&tsBefore) | ||
| sqlDB.Exec(t, "DROP TABLE create_and_drop.a") |
There was a problem hiding this comment.
curious: why did you need to drop the table?
There was a problem hiding this comment.
don't necessarily have to, just copy pasted this test from another test where I initially noticed this behaviour
|
Thanks! bors r=msbutler |
|
Build failed: |
|
bors retry |
|
Build succeeded: |
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=373d9101a12edc3847d2fb6ae78e3adcfb4ca41e&v=4){kind=avatar}
|
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from a75b261 to blathers/backport-release-23.1-116316: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 23.1.x failed. See errors above. error creating merge commit from a75b261 to blathers/backport-release-23.2-116316: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 23.2.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
@adityamaru Heads up that your auto-backport failed here. |
Previously, the codec selection logic only looked at a single manifest to determine whether the backup data requires a system or tenant codec to be read. In older release branches if the full backup was empty (but a subsequent incremental was not) then we could incorrectly use a system codec for a backup that actually required a tenant codec.
To fix this we now process all the manifests in the backup chain and use the first non-empty manifest.
Fixes: #115773
Release note(bug fix): an empty full backup, followed by non-empty incrementals taken inside an application tenant may be unrestoreable because of the use of an incorrect SQL codec