public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(backup): Duplicated backups & restores (#1021)

This commit is contained in:
DionJones615 2024-06-25 12:44:55 -04:00 committed by GitHub
parent e0f52b5bdf
commit 5ef6c730de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/configuration/backuprestore/backuprestore.go
View File

@ -180,12 +180,7 @@ func (bar *BackupAndRestore) Restore(jenkinsClient jenkinsclient.Jenkins) error
if err != nil { if err != nil {
return err 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{ key := types.NamespacedName{
Namespace: jenkins.Namespace, Namespace: jenkins.Namespace,
Name: jenkins.Name, Name: jenkins.Name,
@ -194,6 +189,12 @@ func (bar *BackupAndRestore) Restore(jenkinsClient jenkinsclient.Jenkins) error
if err != nil { if err != nil {
return err return err
} }
jenkins.Spec.Restore.RecoveryOnce = 0
err = bar.Client.Update(context.TODO(), jenkins)
if err != nil {
return err
}
bar.Configuration.Jenkins = jenkins bar.Configuration.Jenkins = jenkins
jenkins.Status.RestoredBackup = backupNumber jenkins.Status.RestoredBackup = backupNumber
@ -223,6 +224,15 @@ func (bar *BackupAndRestore) Backup(setBackupDoneBeforePodDeletion bool) error {
_, _, err := bar.Exec(podName, jenkins.Spec.Backup.ContainerName, command) _, _, err := bar.Exec(podName, jenkins.Spec.Backup.ContainerName, command)
if err == nil { if err == nil {
key := types.NamespacedName{
Namespace: jenkins.Namespace,
Name: jenkins.Name,
}
err = bar.Client.Get(context.TODO(), key, jenkins)
if err != nil {
return err
}
bar.logger.V(log.VDebug).Info(fmt.Sprintf("Backup completed '%d', updating status", backupNumber)) bar.logger.V(log.VDebug).Info(fmt.Sprintf("Backup completed '%d', updating status", backupNumber))
if jenkins.Status.RestoredBackup == 0 { if jenkins.Status.RestoredBackup == 0 {
jenkins.Status.RestoredBackup = backupNumber jenkins.Status.RestoredBackup = backupNumber