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

Merge pull request #84415 from langyenan/fix-evict-admit

Browse Source 
reject pods when under disk pressure
This commit is contained in:
Kubernetes Prow Robot 2019-11-04 13:44:24 -08:00 committed by GitHub
commit e948a67292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/eviction/eviction_manager.go
View File

@ -137,8 +137,10 @@ func (m *managerImpl) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle.PodAd
if kubelettypes.IsCriticalPod(attrs.Pod) { if kubelettypes.IsCriticalPod(attrs.Pod) {
return lifecycle.PodAdmitResult{Admit: true} return lifecycle.PodAdmitResult{Admit: true}
} }
// the node has memory pressure, admit if not best-effort
if hasNodeCondition(m.nodeConditions, v1.NodeMemoryPressure) { // Conditions other than memory pressure reject all pods
nodeOnlyHasMemoryPressureCondition := hasNodeCondition(m.nodeConditions, v1.NodeMemoryPressure) && len(m.nodeConditions) == 1
if nodeOnlyHasMemoryPressureCondition {
notBestEffort := v1.PodQOSBestEffort != v1qos.GetPodQOS(attrs.Pod) notBestEffort := v1.PodQOSBestEffort != v1qos.GetPodQOS(attrs.Pod)
if notBestEffort { if notBestEffort {
return lifecycle.PodAdmitResult{Admit: true} return lifecycle.PodAdmitResult{Admit: true}

46
pkg/kubelet/eviction/eviction_manager_test.go
View File

@ -391,6 +391,52 @@ func TestMemoryPressure(t *testing.T) {
} }
} }
func makeContainersByQOS(class v1.PodQOSClass) []v1.Container {
resource := newResourceList("100m", "1Gi", "")
switch class {
case v1.PodQOSGuaranteed:
return []v1.Container{newContainer("guaranteed-container", resource, resource)}
case v1.PodQOSBurstable:
return []v1.Container{newContainer("burtable-container", resource, nil)}
case v1.PodQOSBestEffort:
fallthrough
default:
return []v1.Container{newContainer("best-effort-container", nil, nil)}
}
}
func TestAdmitUnderNodeConditions(t *testing.T) {
manager := &managerImpl{}
pods := []*v1.Pod{
newPod("guaranteed-pod", scheduling.DefaultPriorityWhenNoDefaultClassExists, makeContainersByQOS(v1.PodQOSGuaranteed), nil),
newPod("burstable-pod", scheduling.DefaultPriorityWhenNoDefaultClassExists, makeContainersByQOS(v1.PodQOSBurstable), nil),
newPod("best-effort-pod", scheduling.DefaultPriorityWhenNoDefaultClassExists, makeContainersByQOS(v1.PodQOSBestEffort), nil),
}
expected := []bool{true, true, true}
for i, pod := range pods {
if result := manager.Admit(&lifecycle.PodAdmitAttributes{Pod: pod}); expected[i] != result.Admit {
t.Errorf("Admit pod: %v, expected: %v, actual: %v", pod, expected[i], result.Admit)
}
}
manager.nodeConditions = []v1.NodeConditionType{v1.NodeMemoryPressure}
expected = []bool{true, true, false}
for i, pod := range pods {
if result := manager.Admit(&lifecycle.PodAdmitAttributes{Pod: pod}); expected[i] != result.Admit {
t.Errorf("Admit pod: %v, expected: %v, actual: %v", pod, expected[i], result.Admit)
}
}
manager.nodeConditions = []v1.NodeConditionType{v1.NodeMemoryPressure, v1.NodeDiskPressure}
expected = []bool{false, false, false}
for i, pod := range pods {
if result := manager.Admit(&lifecycle.PodAdmitAttributes{Pod: pod}); expected[i] != result.Admit {
t.Errorf("Admit pod: %v, expected: %v, actual: %v", pod, expected[i], result.Admit)
}
}
}
// parseQuantity parses the specified value (if provided) otherwise returns 0 value // parseQuantity parses the specified value (if provided) otherwise returns 0 value
func parseQuantity(value string) resource.Quantity { func parseQuantity(value string) resource.Quantity {
if len(value) == 0 { if len(value) == 0 {