fix(eviction): fix rootfs eviction protection

kubewharf · Jan 31, 2024 · 92e1963 · 92e1963
1 parent 7951668
commit 92e1963
Show file tree

Hide file tree

Showing 2 changed files with 420 additions and 16 deletions.
diff --git a/pkg/agent/evictionmanager/plugin/rootfs/rootfs_pressure.go b/pkg/agent/evictionmanager/plugin/rootfs/rootfs_pressure.go
@@ -284,12 +284,10 @@ func (r *PodRootfsPressureEvictionPlugin) podMinimumUsageProtectionMet(usage int
 	if minUsedThreshold == nil {
 		return false
 	}
-	if minUsedThreshold.Quantity != nil && usage < minUsedThreshold.Quantity.Value() {
-		return true
-	} else if percentage < float64(minUsedThreshold.Percentage) {
-		return true
+	if minUsedThreshold.Quantity != nil {
+		return usage < minUsedThreshold.Quantity.Value()
 	} else {
-		return false
+		return percentage < float64(minUsedThreshold.Percentage)
 	}
 }
 
@@ -305,12 +303,10 @@ func (r *PodRootfsPressureEvictionPlugin) reclaimedPodPriorityEvictionMet(pod *v
 	if !isReclaimedPod {
 		return false
 	}
-	if reclaimedPodPriorityUsedThreshold.Quantity != nil && used > reclaimedPodPriorityUsedThreshold.Quantity.Value() {
-		return true
-	} else if percentage > float64(reclaimedPodPriorityUsedThreshold.Percentage) {
-		return true
+	if reclaimedPodPriorityUsedThreshold.Quantity != nil {
+		return used > reclaimedPodPriorityUsedThreshold.Quantity.Value()
 	} else {
-		return false
+		return percentage > float64(reclaimedPodPriorityUsedThreshold.Percentage)
 	}
 }