Skip to content

Commit 655c30e

Browse files
committed
fix PR comments
1 parent df88eab commit 655c30e

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

pkg/controller/ps/upgrade.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package ps
22

33
import (
44
"context"
5+
"k8s.io/apimachinery/pkg/util/wait"
56
"time"
67

78
"github.com/pkg/errors"
@@ -115,16 +116,14 @@ func (r *PerconaServerMySQLReconciler) smartUpdate(ctx context.Context, sts *app
115116
return err
116117
}
117118
}
118-
119-
retriable := func(err error) bool {
120-
return err != nil
119+
120+
backoff := wait.Backoff{
121+
Steps: 5,
122+
Duration: 500 * time.Millisecond,
123+
Factor: 5.0,
124+
Jitter: 0.1,
121125
}
122-
123-
retry := k8sretry.DefaultRetry
124-
retry.Duration = 5 * time.Second
125-
retry.Steps = 10
126-
127-
err = k8sretry.OnError(retry, retriable, func() error {
126+
err = k8sretry.OnError(backoff, func(err error) bool { return err != nil }, func() error {
128127

129128
primPod, err := getMySQLPod(ctx, r.Client, cr, idx)
130129
if err != nil {
@@ -139,7 +138,7 @@ func (r *PerconaServerMySQLReconciler) smartUpdate(ctx context.Context, sts *app
139138

140139
if err != nil {
141140
log.Info("smart update of primary pod did not finish correctly after 10 retries")
142-
return nil
141+
return err
143142
}
144143

145144
log.Info("primary pod updated", "primPod name", primPod.Name)

0 commit comments

Comments
 (0)