Skip to content

Commit 82600c2

Browse files
authored
Merge pull request kubernetes#84948 from zouyee/PriorityFunction
clean up PriorityFunction
2 parents 2f3376e + 3512fde commit 82600c2

15 files changed

+41
-63
lines changed

pkg/scheduler/algorithm/priorities/balanced_resource_allocation_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,8 @@ func TestBalancedResourceAllocation(t *testing.T) {
409409
info.TransientInfo.TransNodeInfo.RequestedVolumes = len(test.pod.Spec.Volumes)
410410
}
411411
}
412-
function := priorityFunction(BalancedResourceAllocationMap, nil, nil)
413412

414-
list, err := function(test.pod, snapshot, test.nodes)
413+
list, err := runMapReducePriority(BalancedResourceAllocationMap, nil, nil, test.pod, snapshot, test.nodes)
415414

416415
if err != nil {
417416
t.Errorf("unexpected error: %v", err)

pkg/scheduler/algorithm/priorities/image_locality_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func TestImageLocalityPriority(t *testing.T) {
185185
for _, test := range tests {
186186
t.Run(test.name, func(t *testing.T) {
187187
snapshot := nodeinfosnapshot.NewSnapshot(test.pods, test.nodes)
188-
list, err := priorityFunction(ImageLocalityPriorityMap, nil, &priorityMetadata{totalNumNodes: len(test.nodes)})(test.pod, snapshot, test.nodes)
188+
list, err := runMapReducePriority(ImageLocalityPriorityMap, nil, &priorityMetadata{totalNumNodes: len(test.nodes)}, test.pod, snapshot, test.nodes)
189189
if err != nil {
190190
t.Errorf("unexpected error: %v", err)
191191
}

pkg/scheduler/algorithm/priorities/least_requested_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func TestLeastRequested(t *testing.T) {
254254
for _, test := range tests {
255255
t.Run(test.name, func(t *testing.T) {
256256
snapshot := nodeinfosnapshot.NewSnapshot(test.pods, test.nodes)
257-
list, err := priorityFunction(LeastRequestedPriorityMap, nil, nil)(test.pod, snapshot, test.nodes)
257+
list, err := runMapReducePriority(LeastRequestedPriorityMap, nil, nil, test.pod, snapshot, test.nodes)
258258
if err != nil {
259259
t.Errorf("unexpected error: %v", err)
260260
}

pkg/scheduler/algorithm/priorities/most_requested_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func TestMostRequested(t *testing.T) {
211211
for _, test := range tests {
212212
t.Run(test.name, func(t *testing.T) {
213213
snapshot := nodeinfosnapshot.NewSnapshot(test.pods, test.nodes)
214-
list, err := priorityFunction(MostRequestedPriorityMap, nil, nil)(test.pod, snapshot, test.nodes)
214+
list, err := runMapReducePriority(MostRequestedPriorityMap, nil, nil, test.pod, snapshot, test.nodes)
215215
if err != nil {
216216
t.Errorf("unexpected error: %v", err)
217217
}

pkg/scheduler/algorithm/priorities/node_affinity_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@ func TestNodeAffinityPriority(t *testing.T) {
168168
for _, test := range tests {
169169
t.Run(test.name, func(t *testing.T) {
170170
snapshot := nodeinfosnapshot.NewSnapshot(nil, test.nodes)
171-
nap := priorityFunction(CalculateNodeAffinityPriorityMap, CalculateNodeAffinityPriorityReduce, nil)
172-
list, err := nap(test.pod, snapshot, test.nodes)
171+
list, err := runMapReducePriority(CalculateNodeAffinityPriorityMap, CalculateNodeAffinityPriorityReduce, nil, test.pod, snapshot, test.nodes)
173172
if err != nil {
174173
t.Errorf("unexpected error: %v", err)
175174
}

pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func TestNodePreferAvoidPriority(t *testing.T) {
142142
for _, test := range tests {
143143
t.Run(test.name, func(t *testing.T) {
144144
snapshot := nodeinfosnapshot.NewSnapshot(nil, test.nodes)
145-
list, err := priorityFunction(CalculateNodePreferAvoidPodsPriorityMap, nil, nil)(test.pod, snapshot, test.nodes)
145+
list, err := runMapReducePriority(CalculateNodePreferAvoidPodsPriorityMap, nil, nil, test.pod, snapshot, test.nodes)
146146
if err != nil {
147147
t.Errorf("unexpected error: %v", err)
148148
}

pkg/scheduler/algorithm/priorities/requested_to_capacity_ratio_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ func TestRequestedToCapacityRatio(t *testing.T) {
241241
newPod := buildResourcesPod("", test.requested)
242242

243243
snapshot := nodeinfosnapshot.NewSnapshot(scheduledPods, nodes)
244-
list, err := priorityFunction(RequestedToCapacityRatioResourceAllocationPriorityDefault().PriorityMap, nil, nil)(newPod, snapshot, nodes)
244+
list, err := runMapReducePriority(RequestedToCapacityRatioResourceAllocationPriorityDefault().PriorityMap, nil, nil, newPod, snapshot, nodes)
245245
if err != nil {
246246
t.Errorf("unexpected error: %v", err)
247247
}
@@ -390,7 +390,7 @@ func TestResourceBinPackingSingleExtended(t *testing.T) {
390390
functionShape, _ := NewFunctionShape([]FunctionShapePoint{{0, 0}, {100, 10}})
391391
resourceToWeightMap := ResourceToWeightMap{v1.ResourceName("intel.com/foo"): 1}
392392
prior := RequestedToCapacityRatioResourceAllocationPriority(functionShape, resourceToWeightMap)
393-
list, err := priorityFunction(prior.PriorityMap, nil, nil)(test.pod, snapshot, test.nodes)
393+
list, err := runMapReducePriority(prior.PriorityMap, nil, nil, test.pod, snapshot, test.nodes)
394394
if err != nil {
395395
t.Errorf("unexpected error: %v", err)
396396
}
@@ -615,7 +615,7 @@ func TestResourceBinPackingMultipleExtended(t *testing.T) {
615615
functionShape, _ := NewFunctionShape([]FunctionShapePoint{{0, 0}, {100, 10}})
616616
resourceToWeightMap := ResourceToWeightMap{v1.ResourceName("intel.com/foo"): 3, v1.ResourceName("intel.com/bar"): 5}
617617
prior := RequestedToCapacityRatioResourceAllocationPriority(functionShape, resourceToWeightMap)
618-
list, err := priorityFunction(prior.PriorityMap, nil, nil)(test.pod, snapshot, test.nodes)
618+
list, err := runMapReducePriority(prior.PriorityMap, nil, nil, test.pod, snapshot, test.nodes)
619619
if err != nil {
620620
t.Errorf("unexpected error: %v", err)
621621
}

pkg/scheduler/algorithm/priorities/resource_limits.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package priorities
1919
import (
2020
"fmt"
2121

22-
"k8s.io/api/core/v1"
22+
v1 "k8s.io/api/core/v1"
2323
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
2424
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
2525

@@ -43,7 +43,7 @@ func ResourceLimitsPriorityMap(pod *v1.Pod, meta interface{}, nodeInfo *schedule
4343

4444
// compute pod limits
4545
var podLimits *schedulernodeinfo.Resource
46-
if priorityMeta, ok := meta.(*priorityMetadata); ok {
46+
if priorityMeta, ok := meta.(*priorityMetadata); ok && priorityMeta != nil {
4747
// We were able to parse metadata, use podLimits from there.
4848
podLimits = priorityMeta.podLimits
4949
} else {

pkg/scheduler/algorithm/priorities/resource_limits_test.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"reflect"
2121
"testing"
2222

23-
"k8s.io/api/core/v1"
23+
v1 "k8s.io/api/core/v1"
2424
"k8s.io/apimachinery/pkg/api/resource"
2525
framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
2626
nodeinfosnapshot "k8s.io/kubernetes/pkg/scheduler/nodeinfo/snapshot"
@@ -144,14 +144,12 @@ func TestResourceLimitsPriority(t *testing.T) {
144144
}
145145

146146
for _, hasMeta := range []bool{true, false} {
147-
var function PriorityFunction
148-
if hasMeta {
149-
function = priorityFunction(ResourceLimitsPriorityMap, nil, metadata)
150-
} else {
151-
function = priorityFunction(ResourceLimitsPriorityMap, nil, nil)
147+
meta := metadata
148+
if !hasMeta {
149+
meta = nil
152150
}
153151

154-
list, err := function(test.pod, snapshot, test.nodes)
152+
list, err := runMapReducePriority(ResourceLimitsPriorityMap, nil, meta, test.pod, snapshot, test.nodes)
155153

156154
if err != nil {
157155
t.Errorf("unexpected error: %v", err)

pkg/scheduler/algorithm/priorities/selector_spreading_test.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,7 @@ func TestSelectorSpreadPriority(t *testing.T) {
355355
)
356356
metaData := metaDataProducer(test.pod, nodes, snapshot)
357357

358-
ttp := priorityFunction(selectorSpread.CalculateSpreadPriorityMap, selectorSpread.CalculateSpreadPriorityReduce, metaData)
359-
list, err := ttp(test.pod, snapshot, makeNodeList(test.nodes))
358+
list, err := runMapReducePriority(selectorSpread.CalculateSpreadPriorityMap, selectorSpread.CalculateSpreadPriorityReduce, metaData, test.pod, snapshot, makeNodeList(test.nodes))
360359
if err != nil {
361360
t.Errorf("unexpected error: %v \n", err)
362361
}
@@ -593,8 +592,7 @@ func TestZoneSelectorSpreadPriority(t *testing.T) {
593592
1,
594593
)
595594
metaData := metaDataProducer(test.pod, nodes, snapshot)
596-
ttp := priorityFunction(selectorSpread.CalculateSpreadPriorityMap, selectorSpread.CalculateSpreadPriorityReduce, metaData)
597-
list, err := ttp(test.pod, snapshot, makeLabeledNodeList(labeledNodes))
595+
list, err := runMapReducePriority(selectorSpread.CalculateSpreadPriorityMap, selectorSpread.CalculateSpreadPriorityReduce, metaData, test.pod, snapshot, makeLabeledNodeList(labeledNodes))
598596
if err != nil {
599597
t.Errorf("unexpected error: %v", err)
600598
}
@@ -783,8 +781,7 @@ func TestZoneSpreadPriority(t *testing.T) {
783781
1,
784782
)
785783
metaData := metaDataProducer(test.pod, nodes, snapshot)
786-
ttp := priorityFunction(zoneSpread.CalculateAntiAffinityPriorityMap, zoneSpread.CalculateAntiAffinityPriorityReduce, metaData)
787-
list, err := ttp(test.pod, snapshot, makeLabeledNodeList(test.nodes))
784+
list, err := runMapReducePriority(zoneSpread.CalculateAntiAffinityPriorityMap, zoneSpread.CalculateAntiAffinityPriorityReduce, metaData, test.pod, snapshot, makeLabeledNodeList(test.nodes))
788785
if err != nil {
789786
t.Errorf("unexpected error: %v", err)
790787
}

0 commit comments

Comments
 (0)