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.

Sign up for GitHub

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

Jump to bottom

release-21.1: release-21.2: backupccl: ensure AOST incremental backup ends after previous backup #80500

Merged
merged 1 commit into from Apr 26, 2022
+16 −0
Merged

release-21.1: release-21.2: backupccl: ensure AOST incremental backup ends after previous backup #80500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/ccl/backupccl/backup_planning.go
View file
Open in desktop
Expand Up @@ -725,6 +725,12 @@ func backupPlanHook(
if err := requireEnterprise("incremental"); err != nil {
return err
}
lastEndTime := prevBackups[len(prevBackups)-1].EndTime
if endTime.Less(lastEndTime) {
return errors.Newf("`AS OF SYSTEM TIME` %s must be greater than "+
"the previous backup's end time of %s.",
endTime.GoTime(), lastEndTime.GoTime())
}
startTime = prevBackups[len(prevBackups)-1].EndTime
}

Expand Down
10 changes: 10 additions & 0 deletions pkg/ccl/backupccl/backup_test.go
View file
Open in desktop
Expand Up @@ -3659,8 +3659,18 @@ func TestBackupAsOfSystemTime(t *testing.T) {

beforeDir := LocalFoo + `/beforeTs`
sqlDB.Exec(t, fmt.Sprintf(`BACKUP DATABASE data TO '%s' AS OF SYSTEM TIME %s`, beforeDir, beforeTs))

equalDir := LocalFoo + `/equalTs`
sqlDB.Exec(t, fmt.Sprintf(`BACKUP DATABASE data TO '%s' AS OF SYSTEM TIME %s`, equalDir, equalTs))
{
// testing UX guardrails for AS OF SYSTEM TIME backups in collections
sqlDB.Exec(t, fmt.Sprintf(`BACKUP DATABASE data INTO '%s' AS OF SYSTEM TIME %s`, equalDir, equalTs))

sqlDB.ExpectErr(t, "`AS OF SYSTEM TIME` .* must be greater than the previous backup's end time of",
fmt.Sprintf(`BACKUP DATABASE data INTO LATEST IN '%s' AS OF SYSTEM TIME %s`,
equalDir,
beforeTs))
}

sqlDB.Exec(t, `DROP TABLE data.bank`)
sqlDB.Exec(t, `RESTORE data.* FROM $1`, beforeDir)
Expand Down