diff --git a/pkg/controller/ps/controller.go b/pkg/controller/ps/controller.go index b9225e2db..2190f6a48 100644 --- a/pkg/controller/ps/controller.go +++ b/pkg/controller/ps/controller.go @@ -796,7 +796,7 @@ func (r *PerconaServerMySQLReconciler) reconcileOrchestrator(ctx context.Context if err != nil { return nil } - g, gCtx := errgroup.WithContext(context.Background()) + g, gCtx := errgroup.WithContext(ctx) if len(raftNodes) > len(existingNodes) { newPeers := util.Difference(raftNodes, existingNodes) @@ -808,7 +808,9 @@ func (r *PerconaServerMySQLReconciler) reconcileOrchestrator(ctx context.Context }) } - log.Error(g.Wait(), "Orchestrator add peers", "peers", newPeers) + if err := g.Wait(); err != nil && !cr.Spec.Pause { + log.Error(err, "Orchestrator add peers", "peers", newPeers) + } } else { oldPeers := util.Difference(existingNodes, raftNodes) @@ -819,7 +821,9 @@ func (r *PerconaServerMySQLReconciler) reconcileOrchestrator(ctx context.Context }) } - log.Error(g.Wait(), "Orchestrator remove peers", "peers", oldPeers) + if err := g.Wait(); err != nil && !cr.Spec.Pause { + log.Error(err, "Orchestrator remove peers", "peers", oldPeers) + } } return nil