kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract another tiny method

This commit is contained in:
Karol Gołąb 2018-05-18 10:10:51 +02:00
parent 34f6a45a04
commit dc34b43a40
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cluster-autoscaler/core/static_autoscaler.go
View File

@ -130,13 +130,8 @@ func (a *StaticAutoscaler) RunOnce(currentTime time.Time) errors.AutoscalerError
if typedErr != nil { if typedErr != nil {
return typedErr return typedErr
} }
if len(allNodes) == 0 { if a.actOnEmptyCluster(allNodes, readyNodes, currentTime) {
return a.onEmptyCluster("Cluster has no nodes.", true) return nil
}
if len(readyNodes) == 0 {
// Cluster Autoscaler may start running before nodes are ready.
// Timeout ensures no ClusterUnhealthy events are published immediately in this case.
return a.onEmptyCluster("Cluster has no ready nodes.", currentTime.After(a.startTime.Add(nodesNotReadyAfterStartTimeout)))
} }
err = a.ClusterStateRegistry.UpdateNodes(allNodes, currentTime) err = a.ClusterStateRegistry.UpdateNodes(allNodes, currentTime)
@ -392,7 +387,21 @@ func (a *StaticAutoscaler) obtainNodeLists() ([]*apiv1.Node, []*apiv1.Node, erro
return allNodes, readyNodes, nil return allNodes, readyNodes, nil
} }
func (a *StaticAutoscaler) onEmptyCluster(status string, emitEvent bool) errors.AutoscalerError { // actOnEmptyCluster returns true if the cluster was empty and thus acted upon
func (a *StaticAutoscaler) actOnEmptyCluster(allNodes, readyNodes []*apiv1.Node, currentTime time.Time) bool {
if len(allNodes) == 0 {
return a.onEmptyCluster("Cluster has no nodes.", true)
}
if len(readyNodes) == 0 {
// Cluster Autoscaler may start running before nodes are ready.
// Timeout ensures no ClusterUnhealthy events are published immediately in this case.
return a.onEmptyCluster("Cluster has no ready nodes.", currentTime.After(a.startTime.Add(nodesNotReadyAfterStartTimeout)))
}
// the cluster is not empty
return false
}
func (a *StaticAutoscaler) onEmptyCluster(status string, emitEvent bool) bool {
glog.Warningf(status) glog.Warningf(status)
a.scaleDown.CleanUpUnneededNodes() a.scaleDown.CleanUpUnneededNodes()
UpdateEmptyClusterStateMetrics() UpdateEmptyClusterStateMetrics()
@ -402,7 +411,7 @@ func (a *StaticAutoscaler) onEmptyCluster(status string, emitEvent bool) errors.
if emitEvent { if emitEvent {
a.AutoscalingContext.LogRecorder.Eventf(apiv1.EventTypeWarning, "ClusterUnhealthy", status) a.AutoscalingContext.LogRecorder.Eventf(apiv1.EventTypeWarning, "ClusterUnhealthy", status)
} }
return nil return true
} }
func allPodsAreNew(pods []*apiv1.Pod, currentTime time.Time) bool { func allPodsAreNew(pods []*apiv1.Pod, currentTime time.Time) bool {