diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index af5331a6c6e..69aa8adf256 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -86,11 +86,6 @@ type Scheduler struct { client clientset.Interface } -// Cache returns the cache in scheduler for test to check the data in scheduler. -func (sched *Scheduler) Cache() internalcache.Cache { - return sched.SchedulerCache -} - type schedulerOptions struct { schedulerAlgorithmSource schedulerapi.SchedulerAlgorithmSource percentageOfNodesToScore int32 @@ -507,7 +502,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { metrics.PodScheduleError(prof.Name, metrics.SinceInSeconds(start)) // trigger un-reserve to clean up state associated with the reserved Pod prof.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) - if forgetErr := sched.Cache().ForgetPod(assumedPod); forgetErr != nil { + if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { klog.Errorf("scheduler cache ForgetPod failed: %v", forgetErr) } sched.recordSchedulingFailure(prof, assumedPodInfo, sts.AsError(), SchedulerError, "") @@ -527,7 +522,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { } // One of the plugins returned status different than success or wait. prof.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) - if forgetErr := sched.Cache().ForgetPod(assumedPod); forgetErr != nil { + if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { klog.Errorf("scheduler cache ForgetPod failed: %v", forgetErr) } sched.recordSchedulingFailure(prof, assumedPodInfo, runPermitStatus.AsError(), reason, "") @@ -553,7 +548,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { } // trigger un-reserve plugins to clean up state associated with the reserved Pod prof.RunReservePluginsUnreserve(bindingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) - if forgetErr := sched.Cache().ForgetPod(assumedPod); forgetErr != nil { + if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { klog.Errorf("scheduler cache ForgetPod failed: %v", forgetErr) } sched.recordSchedulingFailure(prof, assumedPodInfo, waitOnPermitStatus.AsError(), reason, "") @@ -566,7 +561,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { metrics.PodScheduleError(prof.Name, metrics.SinceInSeconds(start)) // trigger un-reserve plugins to clean up state associated with the reserved Pod prof.RunReservePluginsUnreserve(bindingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) - if forgetErr := sched.Cache().ForgetPod(assumedPod); forgetErr != nil { + if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { klog.Errorf("scheduler cache ForgetPod failed: %v", forgetErr) } sched.recordSchedulingFailure(prof, assumedPodInfo, preBindStatus.AsError(), SchedulerError, "") diff --git a/test/integration/util/util.go b/test/integration/util/util.go index b269403fd85..0727d26d987 100644 --- a/test/integration/util/util.go +++ b/test/integration/util/util.go @@ -355,7 +355,7 @@ func InitTestMaster(t *testing.T, nsPrefix string, admission admission.Interface // WaitForSchedulerCacheCleanup waits for cleanup of scheduler's cache to complete func WaitForSchedulerCacheCleanup(sched *scheduler.Scheduler, t *testing.T) { schedulerCacheIsEmpty := func() (bool, error) { - dump := sched.Cache().Dump() + dump := sched.SchedulerCache.Dump() return len(dump.Nodes) == 0 && len(dump.AssumedPods) == 0, nil }