Modify

Author: Milla Samuel

api/v1beta2/foundationdbbackup_types.go

@@ -332,6 +332,12 @@ func (backup *FoundationDBBackup) CheckReconciliation() (bool, error) {
 		reconciled = false
 	}
 
+	desiredBackupURL := backup.BackupURL()
+	if backup.Status.BackupDetails.URL != desiredBackupURL {
+		backup.Status.Generations.NeedsBackupReconfiguration = backup.Generation
+		reconciled = false
+	}
+
 	isRunning := backup.Status.BackupDetails != nil && backup.Status.BackupDetails.Running
 	isPaused := backup.Status.BackupDetails != nil && backup.Status.BackupDetails.Paused
 

controllers/admin_client_test.go

@@ -333,7 +333,12 @@ var _ = Describe("admin_client_test", func() {
 			Context("with a modification to the snapshot time", func() {
 				BeforeEach(func() {
 					backup.Spec.SnapshotPeriodSeconds = ptr.To(20)
+					backup.Spec.BlobStoreConfiguration = &fdbv1beta2.BlobStoreConfiguration{
+						BackupName:  "test-backup",
+						AccountName: "test",
+					}
 					Expect(mockAdminClient.ModifyBackup(backup)).NotTo(HaveOccurred())
+
 				})
 
 				It("should mark the backup as stopped", func() {

controllers/modify_backup.go

@@ -41,7 +41,12 @@ func (s modifyBackup) reconcile(
 		return nil
 	}
 
-	if backup.Status.BackupDetails.SnapshotPeriodSeconds != backup.SnapshotPeriodSeconds() {
+	snapshotPeriod := backup.SnapshotPeriodSeconds()
+	backupURL := backup.BackupURL()
+
+	shouldModify := backup.Status.BackupDetails.SnapshotPeriodSeconds != snapshotPeriod ||
+		backup.Status.BackupDetails.URL != backupURL
+	if shouldModify {
 		adminClient, err := r.adminClientForBackup(ctx, backup)
 		if err != nil {
 			return &requeue{curError: err}

fdbclient/admin_client.go

@@ -882,6 +882,8 @@ func (client *cliAdminClient) ModifyBackup(backup *fdbv1beta2.FoundationDBBackup
 			"modify",
 			"-s",
 			strconv.Itoa(backup.SnapshotPeriodSeconds()),
+			"-d",
+			backup.BackupURL(),
 		},
 	})
 

pkg/fdbadminclient/mock/admin_client_mock.go

@@ -919,6 +919,7 @@ func (client *AdminClient) ModifyBackup(backup *fdbv1beta2.FoundationDBBackup) e
 
 	currentBackup := client.Backups["default"]
 	currentBackup.SnapshotPeriodSeconds = backup.SnapshotPeriodSeconds()
+	currentBackup.URL = backup.BackupURL()
 	client.Backups["default"] = currentBackup
 	return nil
 }