Skip to content

fix: Sink IsConflict error when updating IMC/MC status #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanzhang-oss merged 4 commits into from
Sep 21, 2022
Merged

fix: Sink IsConflict error when updating IMC/MC status #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad98d85
fix: Sink IsConflict error when updating IMC/MC status
Fei-Guo Sep 20, 2022
da5feba
Add log for update failures due to conflicts
Fei-Guo Sep 20, 2022
1760406
fix error format
ryanzhang-oss Sep 21, 2022
21a0448
fix mc log format
ryanzhang-oss Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pkg/controllers/internalmembercluster/member_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,15 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
updateHealthErr := r.updateHealth(ctx, &imc)
r.markInternalMemberClusterJoined(&imc)
if err := r.updateInternalMemberClusterWithRetry(ctx, &imc); err != nil {
klog.ErrorS(err, "failed to update status for %s", klog.KObj(&imc))
if apierrors.IsConflict(err) {
klog.V(2).InfoS("failed to update status due to conflicts", "imc", klog.KObj(&imc))
} else {
klog.ErrorS(err, "failed to update status", "imc", klog.KObj(&imc))
}
return ctrl.Result{}, client.IgnoreNotFound(err)
}
if updateHealthErr != nil {
klog.ErrorS(updateHealthErr, "failed to update health for %s", klog.KObj(&imc))
klog.ErrorS(updateHealthErr, "failed to update health", "imc", klog.KObj(&imc))
return ctrl.Result{}, updateHealthErr
}
return ctrl.Result{RequeueAfter: time.Second * time.Duration(imc.Spec.HeartbeatPeriodSeconds)}, nil
Expand All @@ -92,7 +96,11 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
}
r.markInternalMemberClusterLeft(&imc)
if err := r.updateInternalMemberClusterWithRetry(ctx, &imc); err != nil {
klog.ErrorS(err, "failed to update status for %s", klog.KObj(&imc))
if apierrors.IsConflict(err) {
klog.V(2).InfoS("failed to update status due to conflicts", "imc", klog.KObj(&imc))
} else {
klog.ErrorS(err, "failed to update status", "imc", klog.KObj(&imc))
}
return ctrl.Result{}, client.IgnoreNotFound(err)
}
return ctrl.Result{}, nil
Expand Down
6 changes: 5 additions & 1 deletion pkg/controllers/membercluster/membercluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,11 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
// Copy status from InternalMemberCluster to MemberCluster.
r.syncInternalMemberClusterStatus(currentImc, mc)
if err := r.updateMemberClusterStatus(ctx, mc); err != nil {
klog.ErrorS(err, "failed to update status for", klog.KObj(mc))
if apierrors.IsConflict(err) {
klog.V(2).InfoS("failed to update status due to conflicts", "memberCluster", mcObjRef)
} else {
klog.ErrorS(err, "failed to update status", "memberCluster", mcObjRef)
}
return ctrl.Result{}, client.IgnoreNotFound(err)
}

Expand Down