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

Merge pull request #1328 from EvaDD/master 

Update first in RetryOnConflict
This commit is contained in:
karmada-bot 2022-01-28 16:58:35 +08:00 committed by GitHub
parent be035fab5a f853550111
commit 648e89ec45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/controllers/status/cluster_status_controller.go
View File

@ -201,11 +201,20 @@ func (c *ClusterStatusController) updateStatusIfNeeded(cluster *clusterv1alpha1.
if !equality.Semantic.DeepEqual(cluster.Status, currentClusterStatus) { if !equality.Semantic.DeepEqual(cluster.Status, currentClusterStatus) {
klog.V(4).Infof("Start to update cluster status: %s", cluster.Name) klog.V(4).Infof("Start to update cluster status: %s", cluster.Name)
err := retry.RetryOnConflict(retry.DefaultRetry, func() (err error) { err := retry.RetryOnConflict(retry.DefaultRetry, func() (err error) {
if err = c.Get(context.TODO(), client.ObjectKey{Namespace: cluster.Namespace, Name: cluster.Name}, cluster); err != nil {
return err
}
cluster.Status = currentClusterStatus cluster.Status = currentClusterStatus
return c.Status().Update(context.TODO(), cluster) updateErr := c.Status().Update(context.TODO(), cluster)
if updateErr == nil {
return nil
}
updated := &clusterv1alpha1.Cluster{}
if err = c.Get(context.TODO(), client.ObjectKey{Namespace: cluster.Namespace, Name: cluster.Name}, updated); err == nil {
// make a copy, so we don't mutate the shared cache
cluster = updated.DeepCopy()
} else {
klog.Errorf("failed to get updated cluster %s: %v", cluster.Name, err)
}
return updateErr
}) })
if err != nil { if err != nil {
klog.Errorf("Failed to update health status of the member cluster: %v, err is : %v", cluster.Name, err) klog.Errorf("Failed to update health status of the member cluster: %v, err is : %v", cluster.Name, err)