github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36436 from jszczepkowski/hpa-events-fix

Browse Source 
Automatic merge from submit-queue

HPA: removed duplicated events, added events in all execution paths.
This commit is contained in:
Kubernetes Submit Queue 2016-11-10 03:48:57 -08:00 committed by GitHub
commit cc51dc56a1
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,9 +201,11 @@ func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.
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 {
a.eventRecorder.Event(hpa, api.EventTypeWarning, "FailedParseCustomMetricsAnnotation", err.Error())
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)
} }
if len(targetList.Items) == 0 { if len(targetList.Items) == 0 {
a.eventRecorder.Event(hpa, api.EventTypeWarning, "NoCustomMetricsInAnnotation", err.Error())
return 0, "", "", time.Time{}, fmt.Errorf("no custom metrics in annotation") return 0, "", "", time.Time{}, fmt.Errorf("no custom metrics in annotation")
} }
@ -244,6 +246,7 @@ func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.
} }
quantity, err := resource.ParseQuantity(fmt.Sprintf("%.3f", utilizationProposal)) quantity, err := resource.ParseQuantity(fmt.Sprintf("%.3f", utilizationProposal))
if err != nil { if err != nil {
a.eventRecorder.Event(hpa, api.EventTypeWarning, "FailedSetCustomMetrics", err.Error())
return 0, "", "", time.Time{}, fmt.Errorf("failed to set custom metric value: %v", err) return 0, "", "", time.Time{}, fmt.Errorf("failed to set custom metric value: %v", err)
} }
statusList.Items = append(statusList.Items, extensions.CustomMetricCurrentStatus{ statusList.Items = append(statusList.Items, extensions.CustomMetricCurrentStatus{
@ -253,9 +256,16 @@ func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.
} }
byteStatusList, err := json.Marshal(statusList) byteStatusList, err := json.Marshal(statusList)
if err != nil { if err != nil {
a.eventRecorder.Event(hpa, api.EventTypeWarning, "FailedSerializeCustomMetrics", err.Error())
return 0, "", "", time.Time{}, fmt.Errorf("failed to serialize custom metric status: %v", err) return 0, "", "", time.Time{}, fmt.Errorf("failed to serialize custom metric status: %v", err)
} }
if replicas != currentReplicas {
a.eventRecorder.Eventf(hpa, api.EventTypeNormal, "DesiredReplicasComputedCustomMetric",
"Computed the desired num of replicas: %d, metric: %s, current replicas: %d",
int32(replicas), metric, scale.Status.Replicas)
}
return replicas, metric, string(byteStatusList), timestamp, nil return replicas, metric, string(byteStatusList), timestamp, nil
} }
@ -302,14 +312,6 @@ func (a *HorizontalController) reconcileAutoscaler(hpa *autoscaling.HorizontalPo
cpuDesiredReplicas, cpuCurrentUtilization, cpuTimestamp, err = a.computeReplicasForCPUUtilization(hpa, scale) cpuDesiredReplicas, cpuCurrentUtilization, cpuTimestamp, err = a.computeReplicasForCPUUtilization(hpa, scale)
if err != nil { if err != nil {
a.updateCurrentReplicasInStatus(hpa, currentReplicas) a.updateCurrentReplicasInStatus(hpa, currentReplicas)
lastScaleTime := getLastScaleTime(hpa)
if time.Now().After(lastScaleTime.Add(upscaleForbiddenWindow)) {
a.eventRecorder.Event(hpa, api.EventTypeWarning, "FailedComputeReplicas", err.Error())
} else {
a.eventRecorder.Event(hpa, api.EventTypeNormal, "FailedComputeReplicas", err.Error())
}
return fmt.Errorf("failed to compute desired number of replicas based on CPU utilization for %s: %v", reference, err) return fmt.Errorf("failed to compute desired number of replicas based on CPU utilization for %s: %v", reference, err)
} }
} }
@ -318,14 +320,6 @@ func (a *HorizontalController) reconcileAutoscaler(hpa *autoscaling.HorizontalPo
cmDesiredReplicas, cmMetric, cmStatus, cmTimestamp, err = a.computeReplicasForCustomMetrics(hpa, scale, cmAnnotation) cmDesiredReplicas, cmMetric, cmStatus, cmTimestamp, err = a.computeReplicasForCustomMetrics(hpa, scale, cmAnnotation)
if err != nil { if err != nil {
a.updateCurrentReplicasInStatus(hpa, currentReplicas) a.updateCurrentReplicasInStatus(hpa, currentReplicas)
lastScaleTime := getLastScaleTime(hpa)
if time.Now().After(lastScaleTime.Add(upscaleForbiddenWindow)) {
a.eventRecorder.Event(hpa, api.EventTypeWarning, "FailedComputeCMReplicas", err.Error())
} else {
a.eventRecorder.Event(hpa, api.EventTypeNormal, "FailedComputeCMReplicas", err.Error())
}
return fmt.Errorf("failed to compute desired number of replicas based on Custom Metrics for %s: %v", reference, err) return fmt.Errorf("failed to compute desired number of replicas based on Custom Metrics for %s: %v", reference, err)
} }
} }