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

Merge pull request #39139 from bruceauyeung/k8s-branch-small-code-improvements-and-fix-some-typos

Browse Source 
Automatic merge from submit-queue

small code improvements and fix some typos

Signed-off-by: bruceauyeung <ouyang.qinhua@zte.com.cn>

**What this PR does / why we need it**:

1. eliminate unnecessary extra scale up limit calculation
2. eliminate unnecessary extra pods length computation
3. fix some typos
This commit is contained in:
Kubernetes Submit Queue 2017-04-07 02:22:05 -07:00 committed by GitHub
commit ba349794ab
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,8 +430,8 @@ func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.Ho
// Do not upscale too much to prevent incorrect rapid increase of the number of master replicas caused by // Do not upscale too much to prevent incorrect rapid increase of the number of master replicas caused by
// bogus CPU usage report from heapster/kubelet (like in issue #32304). // bogus CPU usage report from heapster/kubelet (like in issue #32304).
if desiredReplicas > calculateScaleUpLimit(currentReplicas) { if scaleUpLimit := calculateScaleUpLimit(currentReplicas); desiredReplicas > scaleUpLimit {
desiredReplicas = calculateScaleUpLimit(currentReplicas) desiredReplicas = scaleUpLimit
} }
rescale = shouldScale(hpa, currentReplicas, desiredReplicas, timestamp) rescale = shouldScale(hpa, currentReplicas, desiredReplicas, timestamp)
@ -445,7 +445,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpav1Shared *autoscalingv1.Ho
return fmt.Errorf("failed to rescale %s: %v", reference, err) return fmt.Errorf("failed to rescale %s: %v", reference, err)
} }
a.eventRecorder.Eventf(hpa, v1.EventTypeNormal, "SuccessfulRescale", "New size: %d; reason: %s", desiredReplicas, rescaleReason) a.eventRecorder.Eventf(hpa, v1.EventTypeNormal, "SuccessfulRescale", "New size: %d; reason: %s", desiredReplicas, rescaleReason)
glog.Infof("Successfull rescale of %s, old size: %d, new size: %d, reason: %s", glog.Infof("Successful rescale of %s, old size: %d, new size: %d, reason: %s",
hpa.Name, currentReplicas, desiredReplicas, rescaleReason) hpa.Name, currentReplicas, desiredReplicas, rescaleReason)
} else { } else {
glog.V(4).Infof("decided not to scale %s to %v (last scale time was %s)", reference, desiredReplicas, hpa.Status.LastScaleTime) glog.V(4).Infof("decided not to scale %s to %v (last scale time was %s)", reference, desiredReplicas, hpa.Status.LastScaleTime)

5
pkg/controller/podautoscaler/replica_calculator.go
View File

@ -55,11 +55,12 @@ func (c *ReplicaCalculator) GetResourceReplicas(currentReplicas int32, targetUti
return 0, 0, 0, time.Time{}, fmt.Errorf("unable to get pods while calculating replica count: %v", err) return 0, 0, 0, time.Time{}, fmt.Errorf("unable to get pods while calculating replica count: %v", err)
} }
if len(podList.Items) == 0 { itemsLen := len(podList.Items)
if itemsLen == 0 {
return 0, 0, 0, time.Time{}, fmt.Errorf("no pods returned by selector while calculating replica count") return 0, 0, 0, time.Time{}, fmt.Errorf("no pods returned by selector while calculating replica count")
} }
requests := make(map[string]int64, len(podList.Items)) requests := make(map[string]int64, itemsLen)
readyPodCount := 0 readyPodCount := 0
unreadyPods := sets.NewString() unreadyPods := sets.NewString()
missingPods := sets.NewString() missingPods := sets.NewString()