github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28759 from xiang90/pas

Browse Source 
Automatic merge from submit-queue

controller/podautoscaler: minor cleanup

1. remove unnecessary else statement

2. remove unnecessary initialization
This commit is contained in:
Kubernetes Submit Queue 2016-09-06 00:38:46 -07:00 committed by GitHub
commit 0c8b17891b
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkg/controller/podautoscaler/horizontal.go
View File

@ -162,9 +162,9 @@ func (a *HorizontalController) computeReplicasForCPUUtilization(hpa *autoscaling
usageRatio := float64(utilization) / float64(targetUtilization) usageRatio := float64(utilization) / float64(targetUtilization)
if math.Abs(1.0-usageRatio) > tolerance { if math.Abs(1.0-usageRatio) > tolerance {
return int32(math.Ceil(usageRatio * float64(currentReplicas))), &utilization, timestamp, nil return int32(math.Ceil(usageRatio * float64(currentReplicas))), &utilization, timestamp, nil
} else {
return currentReplicas, &utilization, timestamp, nil
} }
return currentReplicas, &utilization, timestamp, nil
} }
// Computes the desired number of replicas based on the CustomMetrics passed in cmAnnotation as json-serialized // Computes the desired number of replicas based on the CustomMetrics passed in cmAnnotation as json-serialized
@ -175,17 +175,12 @@ func (a *HorizontalController) computeReplicasForCPUUtilization(hpa *autoscaling
func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.HorizontalPodAutoscaler, scale *extensions.Scale, func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.HorizontalPodAutoscaler, scale *extensions.Scale,
cmAnnotation string) (replicas int32, metric string, status string, timestamp time.Time, err error) { cmAnnotation string) (replicas int32, metric string, status string, timestamp time.Time, err error) {
currentReplicas := scale.Status.Replicas
replicas = 0
metric = ""
status = ""
timestamp = time.Time{}
err = nil
if cmAnnotation == "" { if cmAnnotation == "" {
return return
} }
currentReplicas := scale.Status.Replicas
var targetList extensions.CustomMetricTargetList var targetList extensions.CustomMetricTargetList
if err := json.Unmarshal([]byte(cmAnnotation), &targetList); err != nil { if err := json.Unmarshal([]byte(cmAnnotation), &targetList); err != nil {
return 0, "", "", time.Time{}, fmt.Errorf("failed to parse custom metrics annotation: %v", err) return 0, "", "", time.Time{}, fmt.Errorf("failed to parse custom metrics annotation: %v", err)
@ -259,7 +254,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa *autoscaling.HorizontalPo
currentReplicas := scale.Status.Replicas currentReplicas := scale.Status.Replicas
cpuDesiredReplicas := int32(0) cpuDesiredReplicas := int32(0)
var cpuCurrentUtilization *int32 = nil cpuCurrentUtilization := new(int32)
cpuTimestamp := time.Time{} cpuTimestamp := time.Time{}
cmDesiredReplicas := int32(0) cmDesiredReplicas := int32(0)
@ -318,7 +313,8 @@ func (a *HorizontalController) reconcileAutoscaler(hpa *autoscaling.HorizontalPo
} }
if desiredReplicas > currentReplicas { if desiredReplicas > currentReplicas {
rescaleReason = fmt.Sprintf("%s above target", rescaleMetric) rescaleReason = fmt.Sprintf("%s above target", rescaleMetric)
} else if desiredReplicas < currentReplicas { }
if desiredReplicas < currentReplicas {
rescaleReason = "All metrics below target" rescaleReason = "All metrics below target"
} }
@ -355,22 +351,24 @@ func (a *HorizontalController) reconcileAutoscaler(hpa *autoscaling.HorizontalPo
} }
func shouldScale(hpa *autoscaling.HorizontalPodAutoscaler, currentReplicas, desiredReplicas int32, timestamp time.Time) bool { func shouldScale(hpa *autoscaling.HorizontalPodAutoscaler, currentReplicas, desiredReplicas int32, timestamp time.Time) bool {
if desiredReplicas != currentReplicas { if desiredReplicas == currentReplicas {
// Going down only if the usageRatio dropped significantly below the target return false
// and there was no rescaling in the last downscaleForbiddenWindow. }
if desiredReplicas < currentReplicas &&
(hpa.Status.LastScaleTime == nil ||
hpa.Status.LastScaleTime.Add(downscaleForbiddenWindow).Before(timestamp)) {
return true
}
// Going up only if the usage ratio increased significantly above the target // Going down only if the usageRatio dropped significantly below the target
// and there was no rescaling in the last upscaleForbiddenWindow. // and there was no rescaling in the last downscaleForbiddenWindow.
if desiredReplicas > currentReplicas && if desiredReplicas < currentReplicas &&
(hpa.Status.LastScaleTime == nil || (hpa.Status.LastScaleTime == nil ||
hpa.Status.LastScaleTime.Add(upscaleForbiddenWindow).Before(timestamp)) { hpa.Status.LastScaleTime.Add(downscaleForbiddenWindow).Before(timestamp)) {
return true return true
} }
// Going up only if the usage ratio increased significantly above the target
// and there was no rescaling in the last upscaleForbiddenWindow.
if desiredReplicas > currentReplicas &&
(hpa.Status.LastScaleTime == nil ||
hpa.Status.LastScaleTime.Add(upscaleForbiddenWindow).Before(timestamp)) {
return true
} }
return false return false
} }