koord-scheduler: Pod updates should not update the timestamp (#2100)

Signed-off-by: zwForrest <756495135@qq.com>
koordinator-sh · Jun 14, 2024 · ae25a92 · ae25a92
1 parent 4c143e6
commit ae25a92
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 3 deletions.
diff --git a/pkg/scheduler/plugins/loadaware/pod_assign_cache.go b/pkg/scheduler/plugins/loadaware/pod_assign_cache.go
@@ -61,9 +61,14 @@ func (p *podAssignCache) assign(nodeName string, pod *corev1.Pod) {
 		m = make(map[types.UID]*podAssignInfo)
 		p.podInfoItems[nodeName] = m
 	}
-	m[pod.UID] = &podAssignInfo{
-		timestamp: timeNowFn(),
-		pod:       pod,
+
+	if _, ok := m[pod.UID]; ok {
+		m[pod.UID].pod = pod
+	} else {
+		m[pod.UID] = &podAssignInfo{
+			timestamp: timeNowFn(),
+			pod:       pod,
+		}
 	}
 }
 

diff --git a/pkg/scheduler/plugins/loadaware/pod_assign_cache_test.go b/pkg/scheduler/plugins/loadaware/pod_assign_cache_test.go
@@ -193,6 +193,64 @@ func TestPodAssignCache_OnUpdate(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "update scheduled running pod, timestamp won't be updated",
+			pod: &corev1.Pod{
+				ObjectMeta: metav1.ObjectMeta{
+					UID:       "123456789",
+					Namespace: "default",
+					Name:      "test",
+				},
+				Spec: corev1.PodSpec{
+					NodeName: "test-node",
+				},
+				Status: corev1.PodStatus{
+					Phase: corev1.PodRunning,
+				},
+			},
+			assignCache: &podAssignCache{
+				podInfoItems: map[string]map[types.UID]*podAssignInfo{
+					"test-node": {
+						"123456789": &podAssignInfo{
+							pod: &corev1.Pod{
+								ObjectMeta: metav1.ObjectMeta{
+									UID:       "123456789",
+									Namespace: "default",
+									Name:      "test",
+								},
+								Spec: corev1.PodSpec{
+									NodeName: "test-node",
+								},
+								Status: corev1.PodStatus{
+									Phase: corev1.PodRunning,
+								},
+							},
+							timestamp: fakeTimeNowFn().Add(1000),
+						},
+					},
+				},
+			},
+			wantCache: map[string]map[types.UID]*podAssignInfo{
+				"test-node": {
+					"123456789": &podAssignInfo{
+						pod: &corev1.Pod{
+							ObjectMeta: metav1.ObjectMeta{
+								UID:       "123456789",
+								Namespace: "default",
+								Name:      "test",
+							},
+							Spec: corev1.PodSpec{
+								NodeName: "test-node",
+							},
+							Status: corev1.PodStatus{
+								Phase: corev1.PodRunning,
+							},
+						},
+						timestamp: fakeTimeNowFn().Add(1000),
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {