Merge pull request #1720 from percona/K8SPSMDB-1088

hors · web-flow · commit 7556bbc601ee · 2024-12-02T23:16:52.000+02:00
K8SPSMDB-1088: Prevent duplicate backup commands
diff --git a/pkg/controller/perconaservermongodbbackup/backup.go b/pkg/controller/perconaservermongodbbackup/backup.go
@@ -81,6 +81,7 @@ func (b *Backup) Start(ctx context.Context, k8sclient client.Client, cluster *ap
 	if err != nil {
 		return status, err
 	}
+	status.State = api.BackupStateRequested
 
 	status = api.PerconaServerMongoDBBackupStatus{
 		StorageName: cr.Spec.StorageName,
diff --git a/pkg/controller/perconaservermongodbbackup/perconaservermongodbbackup_controller.go b/pkg/controller/perconaservermongodbbackup/perconaservermongodbbackup_controller.go
@@ -121,7 +121,7 @@ func (r *ReconcilePerconaServerMongoDBBackup) Reconcile(ctx context.Context, req
 
 	if (cr.Status.State == psmdbv1.BackupStateReady || cr.Status.State == psmdbv1.BackupStateError) &&
 		cr.ObjectMeta.DeletionTimestamp == nil {
-		return rr, nil
+		return reconcile.Result{}, nil
 	}
 
 	status := cr.Status

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ func (b Backup) Start(ctx context.Context, k8sclient client.Client, cluster ap`
`81`	`81`	`if err != nil {`
`82`	`82`	`return status, err`
`83`	`83`	`}`
	`84`	`+ status.State = api.BackupStateRequested`
`84`	`85`
`85`	`86`	`status = api.PerconaServerMongoDBBackupStatus{`
`86`	`87`	`StorageName: cr.Spec.StorageName,`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func (r *ReconcilePerconaServerMongoDBBackup) Reconcile(ctx context.Context, req`
`121`	`121`
`122`	`122`	`if (cr.Status.State == psmdbv1.BackupStateReady \|\| cr.Status.State == psmdbv1.BackupStateError) &&`
`123`	`123`	`cr.ObjectMeta.DeletionTimestamp == nil {`
`124`		`- return rr, nil`
	`124`	`+ return reconcile.Result{}, nil`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`status := cr.Status`