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 #597 from wawa0210/fix-repeat-get-cluster-status 

Delete the extra getClusterHealthStatus logic and use the wait.Poll framework directly
This commit is contained in:
karmada-bot 2021-08-12 19:19:18 +08:00 committed by GitHub
parent 847de9e61a 3d6637fc32
commit 3bbf63dc87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,26 +131,22 @@ func (c *ClusterStatusController) syncClusterStatus(cluster *v1alpha1.Cluster) (
var currentClusterStatus = v1alpha1.ClusterStatus{} var currentClusterStatus = v1alpha1.ClusterStatus{}
// get the health status of member cluster var online, healthy bool
online, healthy := getClusterHealthStatus(clusterClient)
// in case of cluster offline, retry a few times to avoid network unstable problems. // in case of cluster offline, retry a few times to avoid network unstable problems.
// Note: retry timeout should not be too long, otherwise will block other cluster reconcile. // Note: retry timeout should not be too long, otherwise will block other cluster reconcile.
if !online { err = wait.PollImmediate(clusterStatusRetryInterval, clusterStatusRetryTimeout, func() (done bool, err error) {
err := wait.Poll(clusterStatusRetryInterval, clusterStatusRetryTimeout, func() (done bool, err error) { online, healthy = getClusterHealthStatus(clusterClient)
online, healthy = getClusterHealthStatus(clusterClient) if !online {
if !online { return false, nil
return false, nil
}
klog.V(2).Infof("Cluster(%s) back to online after retry.", cluster.Name)
return true, nil
})
// error indicates that retry timeout, update cluster status immediately and return.
if err != nil {
currentClusterStatus.Conditions = generateReadyCondition(false, false)
setTransitionTime(&cluster.Status, &currentClusterStatus)
return c.updateStatusIfNeeded(cluster, currentClusterStatus)
} }
klog.V(2).Infof("Cluster(%s) back to online after retry.", cluster.Name)
return true, nil
})
// error indicates that retry timeout, update cluster status immediately and return.
if err != nil {
currentClusterStatus.Conditions = generateReadyCondition(false, false)
setTransitionTime(&cluster.Status, &currentClusterStatus)
return c.updateStatusIfNeeded(cluster, currentClusterStatus)
} }
clusterVersion, err := getKubernetesVersion(clusterClient) clusterVersion, err := getKubernetesVersion(clusterClient)