From eafbaad9f75355c8c6281e81d23c4f1a70a94445 Mon Sep 17 00:00:00 2001 From: kerthcet Date: Thu, 24 Feb 2022 09:47:21 +0800 Subject: [PATCH] refactor: rename SchedulerCache to Cache in Scheduler Signed-off-by: kerthcet --- pkg/scheduler/eventhandlers.go | 14 ++++----- pkg/scheduler/eventhandlers_test.go | 12 ++++---- pkg/scheduler/factory.go | 2 +- pkg/scheduler/internal/cache/cache.go | 4 +-- pkg/scheduler/internal/cache/cache_test.go | 34 +++++++++++----------- pkg/scheduler/scheduler.go | 20 ++++++------- pkg/scheduler/scheduler_test.go | 26 ++++++++--------- test/integration/scheduler/util.go | 8 ++--- test/integration/util/util.go | 2 +- 9 files changed, 60 insertions(+), 62 deletions(-) diff --git a/pkg/scheduler/eventhandlers.go b/pkg/scheduler/eventhandlers.go index 947ae68cb80..96ae9536af5 100644 --- a/pkg/scheduler/eventhandlers.go +++ b/pkg/scheduler/eventhandlers.go @@ -67,7 +67,7 @@ func (sched *Scheduler) addNodeToCache(obj interface{}) { return } - nodeInfo := sched.SchedulerCache.AddNode(node) + nodeInfo := sched.Cache.AddNode(node) klog.V(3).InfoS("Add event for node", "node", klog.KObj(node)) sched.SchedulingQueue.MoveAllToActiveOrBackoffQueue(queue.NodeAdd, preCheckForNode(nodeInfo)) } @@ -84,7 +84,7 @@ func (sched *Scheduler) updateNodeInCache(oldObj, newObj interface{}) { return } - nodeInfo := sched.SchedulerCache.UpdateNode(oldNode, newNode) + nodeInfo := sched.Cache.UpdateNode(oldNode, newNode) // Only requeue unschedulable pods if the node became more schedulable. if event := nodeSchedulingPropertiesChange(newNode, oldNode); event != nil { sched.SchedulingQueue.MoveAllToActiveOrBackoffQueue(*event, preCheckForNode(nodeInfo)) @@ -108,7 +108,7 @@ func (sched *Scheduler) deleteNodeFromCache(obj interface{}) { return } klog.V(3).InfoS("Delete event for node", "node", klog.KObj(node)) - if err := sched.SchedulerCache.RemoveNode(node); err != nil { + if err := sched.Cache.RemoveNode(node); err != nil { klog.ErrorS(err, "Scheduler cache RemoveNode failed") } } @@ -129,7 +129,7 @@ func (sched *Scheduler) updatePodInSchedulingQueue(oldObj, newObj interface{}) { return } - isAssumed, err := sched.SchedulerCache.IsAssumedPod(newPod) + isAssumed, err := sched.Cache.IsAssumedPod(newPod) if err != nil { utilruntime.HandleError(fmt.Errorf("failed to check whether pod %s/%s is assumed: %v", newPod.Namespace, newPod.Name, err)) } @@ -185,7 +185,7 @@ func (sched *Scheduler) addPodToCache(obj interface{}) { } klog.V(3).InfoS("Add event for scheduled pod", "pod", klog.KObj(pod)) - if err := sched.SchedulerCache.AddPod(pod); err != nil { + if err := sched.Cache.AddPod(pod); err != nil { klog.ErrorS(err, "Scheduler cache AddPod failed", "pod", klog.KObj(pod)) } @@ -205,7 +205,7 @@ func (sched *Scheduler) updatePodInCache(oldObj, newObj interface{}) { } klog.V(4).InfoS("Update event for scheduled pod", "pod", klog.KObj(oldPod)) - if err := sched.SchedulerCache.UpdatePod(oldPod, newPod); err != nil { + if err := sched.Cache.UpdatePod(oldPod, newPod); err != nil { klog.ErrorS(err, "Scheduler cache UpdatePod failed", "pod", klog.KObj(oldPod)) } @@ -229,7 +229,7 @@ func (sched *Scheduler) deletePodFromCache(obj interface{}) { return } klog.V(3).InfoS("Delete event for scheduled pod", "pod", klog.KObj(pod)) - if err := sched.SchedulerCache.RemovePod(pod); err != nil { + if err := sched.Cache.RemovePod(pod); err != nil { klog.ErrorS(err, "Scheduler cache RemovePod failed", "pod", klog.KObj(pod)) } diff --git a/pkg/scheduler/eventhandlers_test.go b/pkg/scheduler/eventhandlers_test.go index b61b4866960..81522ca9892 100644 --- a/pkg/scheduler/eventhandlers_test.go +++ b/pkg/scheduler/eventhandlers_test.go @@ -225,21 +225,19 @@ func TestUpdatePodInCache(t *testing.T) { t.Run(tt.name, func(t *testing.T) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - schedulerCache := cache.New(ttl, ctx.Done()) - schedulerQueue := queue.NewTestQueue(ctx, nil) sched := &Scheduler{ - SchedulerCache: schedulerCache, - SchedulingQueue: schedulerQueue, + Cache: cache.New(ttl, ctx.Done()), + SchedulingQueue: queue.NewTestQueue(ctx, nil), } sched.addPodToCache(tt.oldObj) sched.updatePodInCache(tt.oldObj, tt.newObj) if tt.oldObj.(*v1.Pod).UID != tt.newObj.(*v1.Pod).UID { - if pod, err := sched.SchedulerCache.GetPod(tt.oldObj.(*v1.Pod)); err == nil { - t.Errorf("Get pod UID %v from SchedulerCache but it should not happen", pod.UID) + if pod, err := sched.Cache.GetPod(tt.oldObj.(*v1.Pod)); err == nil { + t.Errorf("Get pod UID %v from cache but it should not happen", pod.UID) } } - pod, err := sched.SchedulerCache.GetPod(tt.newObj.(*v1.Pod)) + pod, err := sched.Cache.GetPod(tt.newObj.(*v1.Pod)) if err != nil { t.Errorf("Failed to get pod from scheduler: %v", err) } diff --git a/pkg/scheduler/factory.go b/pkg/scheduler/factory.go index f598a16d4c6..0327c5f6a64 100644 --- a/pkg/scheduler/factory.go +++ b/pkg/scheduler/factory.go @@ -186,7 +186,7 @@ func (c *Configurator) create() (*Scheduler, error) { ) return &Scheduler{ - SchedulerCache: c.schedulerCache, + Cache: c.schedulerCache, Algorithm: algo, Extenders: extenders, Profiles: profiles, diff --git a/pkg/scheduler/internal/cache/cache.go b/pkg/scheduler/internal/cache/cache.go index 9dd14fd5e09..73fb6c367b5 100644 --- a/pkg/scheduler/internal/cache/cache.go +++ b/pkg/scheduler/internal/cache/cache.go @@ -39,7 +39,7 @@ var ( // "ttl" is how long the assumed pod will get expired. // "stop" is the channel that would close the background goroutine. func New(ttl time.Duration, stop <-chan struct{}) Cache { - cache := newSchedulerCache(ttl, cleanAssumedPeriod, stop) + cache := newCache(ttl, cleanAssumedPeriod, stop) cache.run() return cache } @@ -97,7 +97,7 @@ func (cache *cacheImpl) createImageStateSummary(state *imageState) *framework.Im } } -func newSchedulerCache(ttl, period time.Duration, stop <-chan struct{}) *cacheImpl { +func newCache(ttl, period time.Duration, stop <-chan struct{}) *cacheImpl { return &cacheImpl{ ttl: ttl, period: period, diff --git a/pkg/scheduler/internal/cache/cache_test.go b/pkg/scheduler/internal/cache/cache_test.go index 26e22da6cc1..9e8c890f3b7 100644 --- a/pkg/scheduler/internal/cache/cache_test.go +++ b/pkg/scheduler/internal/cache/cache_test.go @@ -204,7 +204,7 @@ func TestAssumePodScheduled(t *testing.T) { for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { - cache := newSchedulerCache(time.Second, time.Second, nil) + cache := newCache(time.Second, time.Second, nil) for _, pod := range tt.pods { if err := cache.AssumePod(pod); err != nil { t.Fatalf("AssumePod failed: %v", err) @@ -287,7 +287,7 @@ func TestExpirePod(t *testing.T) { for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { - cache := newSchedulerCache(ttl, time.Second, nil) + cache := newCache(ttl, time.Second, nil) for _, pod := range tt.pods { if err := cache.AssumePod(pod.pod); err != nil { @@ -347,7 +347,7 @@ func TestAddPodWillConfirm(t *testing.T) { for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { - cache := newSchedulerCache(ttl, time.Second, nil) + cache := newCache(ttl, time.Second, nil) for _, podToAssume := range tt.podsToAssume { if err := assumeAndFinishBinding(cache, podToAssume, now); err != nil { t.Fatalf("assumePod failed: %v", err) @@ -387,7 +387,7 @@ func TestDump(t *testing.T) { for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { - cache := newSchedulerCache(ttl, time.Second, nil) + cache := newCache(ttl, time.Second, nil) for _, podToAssume := range tt.podsToAssume { if err := assumeAndFinishBinding(cache, podToAssume, now); err != nil { t.Errorf("assumePod failed: %v", err) @@ -455,7 +455,7 @@ func TestAddPodWillReplaceAssumed(t *testing.T) { for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { - cache := newSchedulerCache(ttl, time.Second, nil) + cache := newCache(ttl, time.Second, nil) for _, podToAssume := range tt.podsToAssume { if err := assumeAndFinishBinding(cache, podToAssume, now); err != nil { t.Fatalf("assumePod failed: %v", err) @@ -510,7 +510,7 @@ func TestAddPodAfterExpiration(t *testing.T) { for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { now := time.Now() - cache := newSchedulerCache(ttl, time.Second, nil) + cache := newCache(ttl, time.Second, nil) if err := assumeAndFinishBinding(cache, tt.pod, now); err != nil { t.Fatalf("assumePod failed: %v", err) } @@ -576,7 +576,7 @@ func TestUpdatePod(t *testing.T) { for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { - cache := newSchedulerCache(ttl, time.Second, nil) + cache := newCache(ttl, time.Second, nil) for _, podToAdd := range tt.podsToAdd { if err := cache.AddPod(podToAdd); err != nil { t.Fatalf("AddPod failed: %v", err) @@ -638,7 +638,7 @@ func TestUpdatePodAndGet(t *testing.T) { for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { - cache := newSchedulerCache(ttl, time.Second, nil) + cache := newCache(ttl, time.Second, nil) if err := tt.handler(cache, tt.pod); err != nil { t.Fatalf("unexpected err: %v", err) @@ -709,7 +709,7 @@ func TestExpireAddUpdatePod(t *testing.T) { for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { now := time.Now() - cache := newSchedulerCache(ttl, time.Second, nil) + cache := newCache(ttl, time.Second, nil) for _, podToAssume := range tt.podsToAssume { if err := assumeAndFinishBinding(cache, podToAssume, now); err != nil { t.Fatalf("assumePod failed: %v", err) @@ -786,7 +786,7 @@ func TestEphemeralStorageResource(t *testing.T) { } for i, tt := range tests { t.Run(fmt.Sprintf("case_%d", i), func(t *testing.T) { - cache := newSchedulerCache(time.Second, time.Second, nil) + cache := newCache(time.Second, time.Second, nil) if err := cache.AddPod(tt.pod); err != nil { t.Fatalf("AddPod failed: %v", err) } @@ -839,7 +839,7 @@ func TestRemovePod(t *testing.T) { for name, tt := range tests { t.Run(name, func(t *testing.T) { nodeName := pod.Spec.NodeName - cache := newSchedulerCache(time.Second, time.Second, nil) + cache := newCache(time.Second, time.Second, nil) // Add/Assume pod succeeds even before adding the nodes. if tt.assume { if err := cache.AddPod(pod); err != nil { @@ -881,7 +881,7 @@ func TestForgetPod(t *testing.T) { now := time.Now() ttl := 10 * time.Second - cache := newSchedulerCache(ttl, time.Second, nil) + cache := newCache(ttl, time.Second, nil) for _, pod := range pods { if err := assumeAndFinishBinding(cache, pod, now); err != nil { t.Fatalf("assumePod failed: %v", err) @@ -1063,7 +1063,7 @@ func TestNodeOperators(t *testing.T) { expected := buildNodeInfo(test.node, test.pods) node := test.node - cache := newSchedulerCache(time.Second, time.Second, nil) + cache := newCache(time.Second, time.Second, nil) cache.AddNode(node) for _, pod := range test.pods { if err := cache.AddPod(pod); err != nil { @@ -1448,7 +1448,7 @@ func TestSchedulerCache_UpdateSnapshot(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - cache = newSchedulerCache(time.Second, time.Second, nil) + cache = newCache(time.Second, time.Second, nil) snapshot = NewEmptySnapshot() for _, op := range test.operations { @@ -1663,7 +1663,7 @@ func TestSchedulerCache_updateNodeInfoSnapshotList(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - cache = newSchedulerCache(time.Second, time.Second, nil) + cache = newCache(time.Second, time.Second, nil) snapshot = NewEmptySnapshot() test.operations(t) @@ -1755,7 +1755,7 @@ func makeBasePod(t testingMode, nodeName, objName, cpu, mem, extended string, po } func setupCacheOf1kNodes30kPods(b *testing.B) Cache { - cache := newSchedulerCache(time.Second, time.Second, nil) + cache := newCache(time.Second, time.Second, nil) for i := 0; i < 1000; i++ { nodeName := fmt.Sprintf("node-%d", i) for j := 0; j < 30; j++ { @@ -1771,7 +1771,7 @@ func setupCacheOf1kNodes30kPods(b *testing.B) Cache { } func setupCacheWithAssumedPods(b *testing.B, podNum int, assumedTime time.Time) *cacheImpl { - cache := newSchedulerCache(time.Second, time.Second, nil) + cache := newCache(time.Second, time.Second, nil) for i := 0; i < podNum; i++ { nodeName := fmt.Sprintf("node-%d", i/10) objName := fmt.Sprintf("%s-pod-%d", nodeName, i%10) diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index fca985150cc..e1cb62e20ae 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -65,9 +65,9 @@ const ( // Scheduler watches for new unscheduled pods. It attempts to find // nodes that they fit on and writes bindings back to the api server. type Scheduler struct { - // It is expected that changes made via SchedulerCache will be observed + // It is expected that changes made via Cache will be observed // by NodeLister and Algorithm. - SchedulerCache internalcache.Cache + Cache internalcache.Cache Algorithm ScheduleAlgorithm @@ -357,7 +357,7 @@ func (sched *Scheduler) assume(assumed *v1.Pod, host string) error { // immediately. assumed.Spec.NodeName = host - if err := sched.SchedulerCache.AssumePod(assumed); err != nil { + if err := sched.Cache.AssumePod(assumed); err != nil { klog.ErrorS(err, "Scheduler cache AssumePod failed") return err } @@ -406,7 +406,7 @@ func (sched *Scheduler) extendersBinding(pod *v1.Pod, node string) (bool, error) } func (sched *Scheduler) finishBinding(fwk framework.Framework, assumed *v1.Pod, targetNode string, err error) { - if finErr := sched.SchedulerCache.FinishBinding(assumed); finErr != nil { + if finErr := sched.Cache.FinishBinding(assumed); finErr != nil { klog.ErrorS(finErr, "Scheduler cache FinishBinding failed") } if err != nil { @@ -514,7 +514,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { metrics.PodScheduleError(fwk.ProfileName(), metrics.SinceInSeconds(start)) // trigger un-reserve to clean up state associated with the reserved Pod fwk.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) - if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { + if forgetErr := sched.Cache.ForgetPod(assumedPod); forgetErr != nil { klog.ErrorS(forgetErr, "Scheduler cache ForgetPod failed") } sched.handleSchedulingFailure(fwk, assumedPodInfo, sts.AsError(), SchedulerError, clearNominatedNode) @@ -534,7 +534,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { } // One of the plugins returned status different than success or wait. fwk.RunReservePluginsUnreserve(schedulingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) - if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { + if forgetErr := sched.Cache.ForgetPod(assumedPod); forgetErr != nil { klog.ErrorS(forgetErr, "Scheduler cache ForgetPod failed") } sched.handleSchedulingFailure(fwk, assumedPodInfo, runPermitStatus.AsError(), reason, clearNominatedNode) @@ -567,7 +567,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { } // trigger un-reserve plugins to clean up state associated with the reserved Pod fwk.RunReservePluginsUnreserve(bindingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) - if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { + if forgetErr := sched.Cache.ForgetPod(assumedPod); forgetErr != nil { klog.ErrorS(forgetErr, "scheduler cache ForgetPod failed") } else { // "Forget"ing an assumed Pod in binding cycle should be treated as a PodDelete event, @@ -590,7 +590,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { metrics.PodScheduleError(fwk.ProfileName(), metrics.SinceInSeconds(start)) // trigger un-reserve plugins to clean up state associated with the reserved Pod fwk.RunReservePluginsUnreserve(bindingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) - if forgetErr := sched.SchedulerCache.ForgetPod(assumedPod); forgetErr != nil { + if forgetErr := sched.Cache.ForgetPod(assumedPod); forgetErr != nil { klog.ErrorS(forgetErr, "scheduler cache ForgetPod failed") } else { // "Forget"ing an assumed Pod in binding cycle should be treated as a PodDelete event, @@ -607,7 +607,7 @@ func (sched *Scheduler) scheduleOne(ctx context.Context) { metrics.PodScheduleError(fwk.ProfileName(), metrics.SinceInSeconds(start)) // trigger un-reserve plugins to clean up state associated with the reserved Pod fwk.RunReservePluginsUnreserve(bindingCycleCtx, state, assumedPod, scheduleResult.SuggestedHost) - if err := sched.SchedulerCache.ForgetPod(assumedPod); err != nil { + if err := sched.Cache.ForgetPod(assumedPod); err != nil { klog.ErrorS(err, "scheduler cache ForgetPod failed") } else { // "Forget"ing an assumed Pod in binding cycle should be treated as a PodDelete event, @@ -665,7 +665,7 @@ func (sched *Scheduler) skipPodSchedule(fwk framework.Framework, pod *v1.Pod) bo // Case 2: pod that has been assumed could be skipped. // An assumed pod can be added again to the scheduling queue if it got an update event // during its previous scheduling cycle but before getting assumed. - isAssumed, err := sched.SchedulerCache.IsAssumedPod(pod) + isAssumed, err := sched.Cache.IsAssumedPod(pod) if err != nil { utilruntime.HandleError(fmt.Errorf("failed to check whether pod %s/%s is assumed: %v", pod.Namespace, pod.Name, err)) return false diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index cf9efc2bffd..b146dd1cf25 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -398,7 +398,7 @@ func TestSchedulerScheduleOne(t *testing.T) { var gotForgetPod *v1.Pod var gotAssumedPod *v1.Pod var gotBinding *v1.Binding - sCache := &fakecache.Cache{ + cache := &fakecache.Cache{ ForgetFunc: func(pod *v1.Pod) { gotForgetPod = pod }, @@ -436,9 +436,9 @@ func TestSchedulerScheduleOne(t *testing.T) { defer cancel() s := &Scheduler{ - SchedulerCache: sCache, - Algorithm: item.algo, - client: client, + Cache: cache, + Algorithm: item.algo, + client: client, Error: func(p *framework.QueuedPodInfo, err error) { gotPod = p.Pod gotError = err @@ -881,7 +881,7 @@ func TestSchedulerFailedSchedulingReasons(t *testing.T) { // queuedPodStore: pods queued before processing. // scache: scheduler cache that might contain assumed pods. -func setupTestScheduler(ctx context.Context, queuedPodStore *clientcache.FIFO, scache internalcache.Cache, informerFactory informers.SharedInformerFactory, broadcaster events.EventBroadcaster, fns ...st.RegisterPluginFunc) (*Scheduler, chan *v1.Binding, chan error) { +func setupTestScheduler(ctx context.Context, queuedPodStore *clientcache.FIFO, cache internalcache.Cache, informerFactory informers.SharedInformerFactory, broadcaster events.EventBroadcaster, fns ...st.RegisterPluginFunc) (*Scheduler, chan *v1.Binding, chan error) { bindingChan := make(chan *v1.Binding, 1) client := clientsetfake.NewSimpleClientset() client.PrependReactor("create", "pods", func(action clienttesting.Action) (bool, runtime.Object, error) { @@ -915,15 +915,15 @@ func setupTestScheduler(ctx context.Context, queuedPodStore *clientcache.FIFO, s ) algo := NewGenericScheduler( - scache, + cache, internalcache.NewEmptySnapshot(), schedulerapi.DefaultPercentageOfNodesToScore, ) errChan := make(chan error, 1) sched := &Scheduler{ - SchedulerCache: scache, - Algorithm: algo, + Cache: cache, + Algorithm: algo, NextPod: func() *framework.QueuedPodInfo { return &framework.QueuedPodInfo{PodInfo: framework.NewPodInfo(clientcache.Pop(queuedPodStore).(*v1.Pod))} }, @@ -1180,16 +1180,16 @@ func TestSchedulerBinding(t *testing.T) { } stop := make(chan struct{}) defer close(stop) - scache := internalcache.New(100*time.Millisecond, stop) + cache := internalcache.New(100*time.Millisecond, stop) algo := NewGenericScheduler( - scache, + cache, nil, 0, ) sched := Scheduler{ - Algorithm: algo, - Extenders: test.extenders, - SchedulerCache: scache, + Algorithm: algo, + Extenders: test.extenders, + Cache: cache, } err = sched.bind(context.Background(), fwk, pod, "node", nil) if err != nil { diff --git a/test/integration/scheduler/util.go b/test/integration/scheduler/util.go index 61c793d8933..45b4d3f5469 100644 --- a/test/integration/scheduler/util.go +++ b/test/integration/scheduler/util.go @@ -168,7 +168,7 @@ func createNodes(cs clientset.Interface, prefix string, wrapper *st.NodeWrapper, // createAndWaitForNodesInCache calls createNodes(), and wait for the created // nodes to be present in scheduler cache. func createAndWaitForNodesInCache(testCtx *testutils.TestContext, prefix string, wrapper *st.NodeWrapper, numNodes int) ([]*v1.Node, error) { - existingNodes := testCtx.Scheduler.SchedulerCache.NodeCount() + existingNodes := testCtx.Scheduler.Cache.NodeCount() nodes, err := createNodes(testCtx.ClientSet, prefix, wrapper, numNodes) if err != nil { return nodes, fmt.Errorf("cannot create nodes: %v", err) @@ -180,7 +180,7 @@ func createAndWaitForNodesInCache(testCtx *testutils.TestContext, prefix string, // within 30 seconds; otherwise returns false. func waitForNodesInCache(sched *scheduler.Scheduler, nodeCount int) error { err := wait.Poll(100*time.Millisecond, wait.ForeverTestTimeout, func() (bool, error) { - return sched.SchedulerCache.NodeCount() >= nodeCount, nil + return sched.Cache.NodeCount() >= nodeCount, nil }) if err != nil { return fmt.Errorf("cannot obtain available nodes in scheduler cache: %v", err) @@ -432,7 +432,7 @@ func waitForPDBsStable(testCtx *testutils.TestContext, pdbs []*policy.PodDisrupt // waitCachedPodsStable waits until scheduler cache has the given pods. func waitCachedPodsStable(testCtx *testutils.TestContext, pods []*v1.Pod) error { return wait.Poll(time.Second, 30*time.Second, func() (bool, error) { - cachedPods, err := testCtx.Scheduler.SchedulerCache.PodCount() + cachedPods, err := testCtx.Scheduler.Cache.PodCount() if err != nil { return false, err } @@ -444,7 +444,7 @@ func waitCachedPodsStable(testCtx *testutils.TestContext, pods []*v1.Pod) error if err1 != nil { return false, err1 } - cachedPod, err2 := testCtx.Scheduler.SchedulerCache.GetPod(actualPod) + cachedPod, err2 := testCtx.Scheduler.Cache.GetPod(actualPod) if err2 != nil || cachedPod == nil { return false, err2 } diff --git a/test/integration/util/util.go b/test/integration/util/util.go index fc3b30fbede..931d2d87de3 100644 --- a/test/integration/util/util.go +++ b/test/integration/util/util.go @@ -370,7 +370,7 @@ func InitTestAPIServer(t *testing.T, nsPrefix string, admission admission.Interf // WaitForSchedulerCacheCleanup waits for cleanup of scheduler's cache to complete func WaitForSchedulerCacheCleanup(sched *scheduler.Scheduler, t *testing.T) { schedulerCacheIsEmpty := func() (bool, error) { - dump := sched.SchedulerCache.Dump() + dump := sched.Cache.Dump() return len(dump.Nodes) == 0 && len(dump.AssumedPods) == 0, nil }