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

Merge pull request #1019 from schylek/ttt 

VPA make quick OOM threshold flag-configurable.
This commit is contained in:
Marcin Wielgus 2018-06-27 12:19:00 +02:00 committed by GitHub
parent b8022c728c 94918d696f
commit 739dbd2131
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package priority
import (
"flag"
"math"
"sort"
"time"
@ -33,9 +34,12 @@ const (
// Pods that live for at least that long can be evicted even if their
// request is within the [MinRecommended...MaxRecommended] range.
podLifetimeUpdateThreshold = time.Hour * 12
// Pod that has only one container which OOMed in less than
// podQuickOOMThreshold since start can be evicted
podQuickOOMThreshold = time.Minute * 10
)
var (
evictAfterOOMThreshold = flag.Duration("evict-after-oom-treshold", 10*time.Minute,
`Evict pod that has only one container and it OOMed in less than
evict-after-oom-treshold since start.`)
)
// UpdatePriorityCalculator is responsible for prioritizing updates on pods.
@ -82,7 +86,7 @@ func (calc *UpdatePriorityCalculator) AddPod(pod *apiv1.Pod, recommendation *vpa
terminationState := pod.Status.ContainerStatuses[0].LastTerminationState
if terminationState.Terminated != nil &&
terminationState.Terminated.Reason == "OOMKilled" &&
terminationState.Terminated.FinishedAt.Time.Sub(terminationState.Terminated.StartedAt.Time) < podQuickOOMThreshold {
terminationState.Terminated.FinishedAt.Time.Sub(terminationState.Terminated.StartedAt.Time) < *evictAfterOOMThreshold {
quickOOM = true
glog.V(2).Infof("quick OOM detected in pod %v", pod.Name)
}
@ -91,7 +95,7 @@ func (calc *UpdatePriorityCalculator) AddPod(pod *apiv1.Pod, recommendation *vpa
// The update is allowed in following cases:
// - the request is outside the recommended range for some container.
// - the pod lives for at least 24h and the resource diff is >= MinChangePriority.
// - there is only one container in a pod and it OOMed in less than podQuickOOMThreshold
// - there is only one container in a pod and it OOMed in less than evictAfterOOMThreshold
if !updatePriority.outsideRecommendedRange && !quickOOM {
if pod.Status.StartTime == nil {
// TODO: Set proper condition on the VPA.