github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kube-scheduler: checked err for golangci-lint

Browse Source
This commit is contained in:
Mengjiao Liu
2023-10-12 18:19:55 +08:00
parent b0a73213d6
commit bd8ac8c7fa
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/scheduler/scheduler_test.go
View File

@@ -282,8 +282,13 @@ func TestFailureHandler(t *testing.T) {
queue := internalqueue.NewPriorityQueue(nil, informerFactory, internalqueue.WithClock(testingclock.NewFakeClock(time.Now()))) queue := internalqueue.NewPriorityQueue(nil, informerFactory, internalqueue.WithClock(testingclock.NewFakeClock(time.Now())))
schedulerCache := internalcache.New(ctx, 30*time.Second) schedulerCache := internalcache.New(ctx, 30*time.Second)
queue.Add(logger, testPod) if err := queue.Add(logger, testPod); err != nil {
queue.Pop(logger) t.Fatalf("Add failed: %v", err)
}
if _, err := queue.Pop(logger); err != nil {
t.Fatalf("Pop failed: %v", err)
}
if tt.podUpdatedDuringScheduling { if tt.podUpdatedDuringScheduling {
podInformer.Informer().GetStore().Update(testPodUpdated) podInformer.Informer().GetStore().Update(testPodUpdated)

12
pkg/scheduler/testing/framework/fake_extender.go
View File

@@ -240,8 +240,8 @@ func (f *FakeExtender) selectVictimsOnNodeByExtender(logger klog.Logger, pod *v1
var potentialVictims []*v1.Pod var potentialVictims []*v1.Pod
removePod := func(rp *v1.Pod) { removePod := func(rp *v1.Pod) error {
nodeInfoCopy.RemovePod(logger, rp) return nodeInfoCopy.RemovePod(logger, rp)
} }
addPod := func(ap *v1.Pod) { addPod := func(ap *v1.Pod) {
nodeInfoCopy.AddPod(ap) nodeInfoCopy.AddPod(ap)
@@ -252,7 +252,9 @@ func (f *FakeExtender) selectVictimsOnNodeByExtender(logger klog.Logger, pod *v1
for _, p := range nodeInfoCopy.Pods { for _, p := range nodeInfoCopy.Pods {
if corev1helpers.PodPriority(p.Pod) < podPriority { if corev1helpers.PodPriority(p.Pod) < podPriority {
potentialVictims = append(potentialVictims, p.Pod) potentialVictims = append(potentialVictims, p.Pod)
removePod(p.Pod) if err := removePod(p.Pod); err != nil {
return nil, 0, false, err
}
} }
} }
sort.Slice(potentialVictims, func(i, j int) bool { return util.MoreImportantPod(potentialVictims[i], potentialVictims[j]) }) sort.Slice(potentialVictims, func(i, j int) bool { return util.MoreImportantPod(potentialVictims[i], potentialVictims[j]) })
@@ -279,7 +281,9 @@ func (f *FakeExtender) selectVictimsOnNodeByExtender(logger klog.Logger, pod *v1
addPod(p) addPod(p)
status := f.runPredicate(pod, nodeInfoCopy.Node()) status := f.runPredicate(pod, nodeInfoCopy.Node())
if !status.IsSuccess() { if !status.IsSuccess() {
removePod(p) if err := removePod(p); err != nil {
return false
}
victims = append(victims, p) victims = append(victims, p)
} }
return status.IsSuccess() return status.IsSuccess()