Merge pull request #80500 from msbutler/backport21.1-80287

release-21.1: release-21.2: backupccl: ensure AOST incremental backup ends after previous backup
cockroachdb · Apr 26, 2022 · 53c76a2 · 53c76a2
2 parents 66f3057 + 4e52ddb
commit 53c76a2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/pkg/ccl/backupccl/backup_planning.go b/pkg/ccl/backupccl/backup_planning.go
@@ -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
 		}
 

diff --git a/pkg/ccl/backupccl/backup_test.go b/pkg/ccl/backupccl/backup_test.go
@@ -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)