koordlet: fix memory evict for nil podMetric (#648)

Signed-off-by: saintube <saintube@foxmail.com>

koordlet: fix memory evict for nil podMetric (#648)
Signed-off-by: saintube <saintube@foxmail.com>
c955b2eb · Frame · GitHub · 13896cd7 · c955b2eb
Unverified Commit c955b2eb authored 2 years ago by Frame Committed by GitHub 2 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 8 additions and 3 deletions
+8 -3
--- a/pkg/koordlet/resmanager/memory_evict.go
+++ b/pkg/koordlet/resmanager/memory_evict.go
@@ -170,11 +170,16 @@ func (m *MemoryEvictor) getSortedBEPodInfos(podMetrics []*metriccache.PodResourc

 	sort.Slice(bePodInfos, func(i, j int) bool {
 		// TODO: https://github.com/koordinator-sh/koordinator/pull/65#discussion_r849048467
-		if bePodInfos[i].pod.Spec.Priority == nil || bePodInfos[j].pod.Spec.Priority == nil ||
-			*bePodInfos[i].pod.Spec.Priority == *bePodInfos[j].pod.Spec.Priority {
+		// compare priority > podMetric > name
+		if bePodInfos[i].pod.Spec.Priority != nil && bePodInfos[j].pod.Spec.Priority != nil && *bePodInfos[i].pod.Spec.Priority != *bePodInfos[j].pod.Spec.Priority {
+			return *bePodInfos[i].pod.Spec.Priority < *bePodInfos[j].pod.Spec.Priority
+		}
+		if bePodInfos[i].podMetric != nil && bePodInfos[j].podMetric != nil {
 			return bePodInfos[i].podMetric.MemoryUsed.MemoryWithoutCache.Value() > bePodInfos[j].podMetric.MemoryUsed.MemoryWithoutCache.Value()
+		} else if bePodInfos[i].podMetric == nil && bePodInfos[j].podMetric == nil {
+			return bePodInfos[i].pod.Name > bePodInfos[j].pod.Name
 		}
-		return *bePodInfos[i].pod.Spec.Priority < *bePodInfos[j].pod.Spec.Priority
+		return bePodInfos[j].podMetric == nil
 	})

 	return bePodInfos