scheduler: make ReservationInfo.AddAssignedPod idempotent (koordinato…

…r-sh#1709) Signed-off-by: Joseph <joseph.t.lee@outlook.com>
ls-2018 · Mar 25, 2024 · ae3ea2f · ae3ea2f
1 parent 2fcaad8
commit ae3ea2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pkg/scheduler/frameworkext/helper/forcesync_eventhandler.go b/pkg/scheduler/frameworkext/helper/forcesync_eventhandler.go
@@ -24,6 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachinerytypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/klog/v2"
 )
 
 type forceSyncEventHandler struct {
@@ -64,6 +65,7 @@ func (h *forceSyncEventHandler) OnAdd(obj interface{}) {
 				return
 			}
 			delete(h.objects, objectUID)
+			klog.Warningf("Object %q has been updated multiple times in a short period of time", klog.KObj(objectMeta).String())
 		}
 	}
 	if h.handler != nil {

diff --git a/pkg/scheduler/frameworkext/reservation_info.go b/pkg/scheduler/frameworkext/reservation_info.go
@@ -295,6 +295,10 @@ func (ri *ReservationInfo) UpdatePod(pod *corev1.Pod) {
 }
 
 func (ri *ReservationInfo) AddAssignedPod(pod *corev1.Pod) {
+	if _, ok := ri.AssignedPods[pod.UID]; ok {
+		klog.Warningf("Repeatedly add assigned Pod %v in reservation %v, skip it.", klog.KObj(pod), klog.KObj(ri))
+		return
+	}
 	requirement := NewPodRequirement(pod)
 	ri.Allocated = quotav1.Add(ri.Allocated, quotav1.Mask(requirement.Requests, ri.ResourceNames))
 	ri.AllocatedPorts = util.AppendHostPorts(ri.AllocatedPorts, requirement.Ports)