using modify reconciler

Author: 09harsh

api/v1beta2/foundationdbcluster_types_test.go

@@ -831,13 +831,15 @@ var _ = Describe("[api] FoundationDBCluster", func() {
 			status := FoundationDBLiveBackupStatus{}
 			err = statusDecoder.Decode(&status)
 			Expect(err).NotTo(HaveOccurred())
+			UID := "3874300eea1e154e4079530b381f71c3"
 			Expect(status).To(Equal(FoundationDBLiveBackupStatus{
 				DestinationURL:          "blobstore://minio@minio-service:9000/sample-cluster?bucket=fdb-backups",
 				SnapshotIntervalSeconds: 864000,
 				Status: FoundationDBLiveBackupStatusState{
 					Running: true,
 				},
 				Restorable: ptr.To(false),
+				UID:        &UID,
 			}))
 		})
 	})

controllers/modify_backup.go

@@ -45,13 +45,6 @@ func (s modifyBackup) reconcile(
 		return nil
 	}
 
-	// Modifying backups will remove encryption from previously encrypted backups.
-	// To preserve encryption, skip backup modifications if encryption is enabled.
-	// See FoundationDB issue: https://github.com/apple/foundationdb/issues/12544
-	if backup.Spec.EncryptionKeyPath != "" {
-		return nil
-	}
-
 	// The modify command is only required for continuous backups.
 	if backup.NeedsBackupReconfiguration() &&
 		backup.GetBackupMode() == fdbv1beta2.BackupModeContinuous {

e2e/fixtures/fdb_backup.go

@@ -273,6 +273,20 @@ func (fdbBackup *FdbBackup) Pause() {
 	fdbBackup.setState(fdbv1beta2.BackupStatePaused)
 }
 
+// SetSnapshotInterval updates the snapshot interval of the current backup
+func (fdbBackup *FdbBackup) SetSnapshotInterval(snapshotPeriodSeconds int) {
+	objectKey := client.ObjectKeyFromObject(fdbBackup.backup)
+	foundationDBBackup := &fdbv1beta2.FoundationDBBackup{}
+	gomega.Expect(fdbBackup.fdbCluster.factory.GetControllerRuntimeClient().
+		Get(context.Background(), objectKey, foundationDBBackup)).NotTo(gomega.HaveOccurred())
+
+	foundationDBBackup.Spec.SnapshotPeriodSeconds = &snapshotPeriodSeconds
+	gomega.Expect(fdbBackup.fdbCluster.factory.GetControllerRuntimeClient().
+		Update(context.Background(), foundationDBBackup)).NotTo(gomega.HaveOccurred())
+	fdbBackup.backup = foundationDBBackup
+	fdbBackup.WaitForReconciliation()
+}
+
 // RunCommandOnBackupPod runs command on the backup pod.
 func (fdbBackup *FdbBackup) RunCommandOnBackupPod(command string) string {
 	backupPod := fdbBackup.GetBackupPod()
@@ -304,12 +318,6 @@ func (fdbBackup *FdbBackup) RunStatusCommand() *fdbv1beta2.FoundationDBLiveBacku
 	return status
 }
 
-// RunModifyCommand runs the modify command on a backup pod to change the snapshot period.
-func (fdbBackup *FdbBackup) RunModifyCommand(snapshotPeriodSeconds int, tag string) {
-	command := fmt.Sprintf("fdbbackup modify -s %d -t %s", snapshotPeriodSeconds, tag)
-	fdbBackup.RunCommandOnBackupPod(command)
-}
-
 // RunListCommand runs the list command on a backup pod.
 func (fdbBackup *FdbBackup) RunListCommand() []string {
 	backupURL, err := fdbBackup.backup.BaseURL()

e2e/test_operator_backups/operator_backup_test.go

@@ -224,6 +224,7 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
 							// running status command
 							statusCommandOutput := backup.RunStatusCommand()
 							Expect(statusCommandOutput.SnapshotIntervalSeconds).To(Equal(864000))
+							Expect(statusCommandOutput.UID).NotTo(BeNil())
 							backupUID := *statusCommandOutput.UID
 
 							// running list command
@@ -234,7 +235,7 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
 							// restart the backup before modifying since the backup is paused
 							modifiedSnapshotPeriod := 900000
 							backup.Start()
-							backup.RunModifyCommand(modifiedSnapshotPeriod, "default")
+							backup.SetSnapshotInterval(modifiedSnapshotPeriod)
 							// validating snapshot interval changed and the backup UID is same
 							statusCommandOutput = backup.RunStatusCommand()
 							Expect(

fdbclient/admin_client.go

@@ -941,15 +941,28 @@ func (client *cliAdminClient) ModifyBackup(backup *fdbv1beta2.FoundationDBBackup
 		return err
 	}
 
+	args := []string{
+		"modify",
+		"-s",
+		strconv.Itoa(backup.SnapshotPeriodSeconds()),
+		"-d",
+		backupURL,
+	}
+
+	encryptionKeyPath, err := backup.GetEncryptionKey()
+	if err != nil {
+		return err
+	}
+
+	if encryptionKeyPath != "" {
+		args = append(args, "--encryption-key-file", encryptionKeyPath)
+	}
+
+	client.log.V(1).Info("running backup modify", "command", args)
+
 	_, err = client.runCommand(cliCommand{
 		binary: fdbbackupStr,
-		args: []string{
-			"modify",
-			"-s",
-			strconv.Itoa(backup.SnapshotPeriodSeconds()),
-			"-d",
-			backupURL,
-		},
+		args:   args,
 	})
 
 	return err