Skip to content

Commit 37b7c55

Browse files
authored
fix: Do not log error if it's a conflict error (#56)
* fix: Do not log error if it's a conflict error
1 parent 3f3cd7e commit 37b7c55

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

internal/reconciler/statefulset.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ func (b *StatefulSetReconciler) Reconcile(ctx context.Context) (ctrl.Result, err
3737
}
3838

3939
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
40-
err := b.GetItem(ctx, statefulset)
41-
if err != nil {
40+
if err := b.GetItem(ctx, statefulset); err != nil {
4241
if apierrors.IsNotFound(err) {
4342
b.CreateItem(ctx, statefulset)
4443
return nil
@@ -47,15 +46,18 @@ func (b *StatefulSetReconciler) Reconcile(ctx context.Context) (ctrl.Result, err
4746
return err
4847
}
4948

50-
err = b.updateFields(ctx, statefulset)
51-
if err != nil {
52-
b.Logger.Error(err, "Failed updating statefulset")
49+
if err := b.updateFields(ctx, statefulset); err != nil {
50+
b.Logger.Error(err, "Failed calculating new statefulset")
5351
return err
5452
}
5553

56-
err = b.Client.Update(ctx, statefulset)
57-
if err != nil {
58-
b.Logger.Error(err, "Failed updating statefulset something something, trying again?")
54+
if err := b.Client.Update(ctx, statefulset); err != nil {
55+
// Conflict errors are expected during retries and do not indicate a critical issue.
56+
// Logging them would create unnecessary noise in the logs.
57+
if !apierrors.IsConflict(err) {
58+
b.Logger.Error(err, "Failed updating new statefulset")
59+
}
60+
5961
return err
6062
}
6163

0 commit comments

Comments
 (0)