Modify

Author: Milla Samuel

api/v1beta2/foundationdbbackup_types.go

@@ -298,6 +298,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

@@ -325,7 +325,10 @@ var _ = Describe("admin_client_test", func() {
 
 			Context("with a modification to the snapshot time", func() {
 				BeforeEach(func() {
-					err = mockAdminClient.ModifyBackup(20)
+					err = mockAdminClient.ModifyBackup(
+						20,
+						"blobstore://test@test-service/test-backup",
+					)
 					Expect(err).NotTo(HaveOccurred())
 				})
 

controllers/modify_backup.go

@@ -42,7 +42,11 @@ func (s modifyBackup) reconcile(
 	}
 
 	snapshotPeriod := backup.SnapshotPeriodSeconds()
-	if backup.Status.BackupDetails.SnapshotPeriodSeconds != snapshotPeriod {
+	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}
@@ -51,7 +55,7 @@ func (s modifyBackup) reconcile(
 			_ = adminClient.Close()
 		}()
 
-		err = adminClient.ModifyBackup(snapshotPeriod)
+		err = adminClient.ModifyBackup(snapshotPeriod, backupURL)
 		if err != nil {
 			return &requeue{curError: err}
 		}

fdbclient/admin_client.go

@@ -873,13 +873,15 @@ func (client *cliAdminClient) ResumeBackups() error {
 }
 
 // ModifyBackup updates the backup parameters.
-func (client *cliAdminClient) ModifyBackup(snapshotPeriodSeconds int) error {
+func (client *cliAdminClient) ModifyBackup(snapshotPeriodSeconds int, url string) error {
 	_, err := client.runCommand(cliCommand{
 		binary: fdbbackupStr,
 		args: []string{
 			"modify",
 			"-s",
 			fmt.Sprintf("%d", snapshotPeriodSeconds),
+			"-d",
+			url,
 		},
 	})
 	return err

kubectl-fdb/cmd/version_test.go

@@ -16,8 +16,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-package cmd
+ */package cmd
 
 import (
 	"bytes"

pkg/fdbadminclient/admin_client.go

@@ -82,7 +82,7 @@ type AdminClient interface {
 	ResumeBackups() error
 
 	// ModifyBackup modifies the configuration of the backup.
-	ModifyBackup(int) error
+	ModifyBackup(snapshotPeriodSeconds int, url string) error
 
 	// GetBackupStatus gets the status of the current backup.
 	GetBackupStatus() (*fdbv1beta2.FoundationDBLiveBackupStatus, error)

pkg/fdbadminclient/mock/admin_client_mock.go

@@ -909,7 +909,7 @@ func (client *AdminClient) ResumeBackups() error {
 }
 
 // ModifyBackup reconfigures the backup.
-func (client *AdminClient) ModifyBackup(snapshotPeriodSeconds int) error {
+func (client *AdminClient) ModifyBackup(snapshotPeriodSeconds int, url string) error {
 	adminClientMutex.Lock()
 	defer adminClientMutex.Unlock()
 
@@ -919,6 +919,7 @@ func (client *AdminClient) ModifyBackup(snapshotPeriodSeconds int) error {
 
 	backup := client.Backups["default"]
 	backup.SnapshotPeriodSeconds = snapshotPeriodSeconds
+	backup.URL = url
 	client.Backups["default"] = backup
 	return nil
 }