karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add retry on update status 

Signed-off-by: pigletfly <wangbing.adam@gmail.com>
This commit is contained in:
pigletfly 2021-11-25 16:25:38 +08:00
parent b35d2e0f5a
commit 39985d5dbe
4 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/controllers/binding/binding_controller.go
View File

@ -13,6 +13,7 @@ import (
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/retry"
"k8s.io/klog/v2"
controllerruntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
@ -275,8 +276,11 @@ func (c *ResourceBindingController) updateFullyAppliedCondition(binding *workv1a
Message: FullyAppliedSuccessMessage,
}
meta.SetStatusCondition(&binding.Status.Conditions, newBindingFullyAppliedCondition)
err := c.Client.Status().Update(context.TODO(), binding)
return err
return retry.RetryOnConflict(retry.DefaultBackoff, func() (err error) {
if err = c.Get(context.TODO(), client.ObjectKey{Namespace: binding.Namespace, Name: binding.Name}, binding); err != nil {
return err
}
meta.SetStatusCondition(&binding.Status.Conditions, newBindingFullyAppliedCondition)
return c.Status().Update(context.TODO(), binding)
})
}

12
pkg/controllers/binding/cluster_resource_binding_controller.go
View File

@ -13,6 +13,7 @@ import (
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/retry"
"k8s.io/klog/v2"
controllerruntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
@ -266,8 +267,11 @@ func (c *ClusterResourceBindingController) updateFullyAppliedCondition(binding *
Message: FullyAppliedSuccessMessage,
}
meta.SetStatusCondition(&binding.Status.Conditions, newBindingFullyAppliedCondition)
err := c.Client.Status().Update(context.TODO(), binding)
return err
return retry.RetryOnConflict(retry.DefaultBackoff, func() (err error) {
if err = c.Get(context.TODO(), client.ObjectKey{Namespace: binding.Namespace, Name: binding.Name}, binding); err != nil {
return err
}
meta.SetStatusCondition(&binding.Status.Conditions, newBindingFullyAppliedCondition)
return c.Status().Update(context.TODO(), binding)
})
}

11
pkg/controllers/execution/execution_controller.go
View File

@ -11,6 +11,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/retry"
"k8s.io/klog/v2"
controllerruntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
@ -241,7 +242,11 @@ func (c *Controller) updateAppliedCondition(work *workv1alpha1.Work, status meta
LastTransitionTime: metav1.Now(),
}
meta.SetStatusCondition(&work.Status.Conditions, newWorkAppliedCondition)
err := c.Client.Status().Update(context.TODO(), work)
return err
return retry.RetryOnConflict(retry.DefaultBackoff, func() (err error) {
if err = c.Get(context.TODO(), client.ObjectKey{Namespace: work.Namespace, Name: work.Name}, work); err != nil {
return err
}
meta.SetStatusCondition(&work.Status.Conditions, newWorkAppliedCondition)
return c.Status().Update(context.TODO(), work)
})
}

16
pkg/controllers/status/workstatus_controller.go
View File

@ -13,6 +13,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/retry"
"k8s.io/klog/v2"
controllerruntime "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
@ -288,14 +289,13 @@ func (c *WorkStatusController) reflectStatus(work *workv1alpha1.Work, clusterObj
manifestStatus.Status = rawExtension
}
work.Status.ManifestStatuses = c.mergeStatus(work.Status.ManifestStatuses, manifestStatus)
if err := c.Client.Status().Update(context.TODO(), work); err != nil {
klog.Errorf("Failed to reflect status to work(%s/%s): %v", work.Namespace, work.Name, err)
return err
}
return nil
return retry.RetryOnConflict(retry.DefaultBackoff, func() (err error) {
if err = c.Get(context.TODO(), client.ObjectKey{Namespace: work.Namespace, Name: work.Name}, work); err != nil {
return err
}
work.Status.ManifestStatuses = c.mergeStatus(work.Status.ManifestStatuses, manifestStatus)
return c.Status().Update(context.TODO(), work)
})
}
func (c *WorkStatusController) buildStatusIdentifier(work *workv1alpha1.Work, clusterObj *unstructured.Unstructured) (*workv1alpha1.ResourceIdentifier, error) {