From 20246998da33363cd933a3e73c1782a5dea5cab9 Mon Sep 17 00:00:00 2001
From: Dion <dion.jones@n-able.com>
Date: Thu, 20 Jun 2024 12:48:17 -0400
Subject: [PATCH] fix: Duplicated restores

---
 pkg/configuration/backuprestore/backuprestore.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/configuration/backuprestore/backuprestore.go b/pkg/configuration/backuprestore/backuprestore.go
index b2deb9ca..122225f5 100644
--- a/pkg/configuration/backuprestore/backuprestore.go
+++ b/pkg/configuration/backuprestore/backuprestore.go
@@ -180,12 +180,7 @@ func (bar *BackupAndRestore) Restore(jenkinsClient jenkinsclient.Jenkins) error
 		if err != nil {
 			return err
 		}
-		//TODO fix me because we're doing two saves unatomically
-		jenkins.Spec.Restore.RecoveryOnce = 0
-		err = bar.Client.Update(context.TODO(), jenkins)
-		if err != nil {
-			return err
-		}
+
 		key := types.NamespacedName{
 			Namespace: jenkins.Namespace,
 			Name:      jenkins.Name,
@@ -194,6 +189,12 @@ func (bar *BackupAndRestore) Restore(jenkinsClient jenkinsclient.Jenkins) error
 		if err != nil {
 			return err
 		}
+
+		jenkins.Spec.Restore.RecoveryOnce = 0
+		err = bar.Client.Update(context.TODO(), jenkins)
+		if err != nil {
+			return err
+		}
 		bar.Configuration.Jenkins = jenkins
 
 		jenkins.Status.RestoredBackup = backupNumber