github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

wrap errors from DefaultPreemption, ImageLocality and NodeAffinity plugins

Browse Source
This commit is contained in:
SataQiu 2020-09-25 10:38:27 +08:00
parent 9d3a8a0b96
commit 8c51c9955c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go
View File

@ -84,7 +84,7 @@ func (pl *DefaultPreemption) PostFilter(ctx context.Context, state *framework.Cy
nnn, err := pl.preempt(ctx, state, pod, m)
if err != nil {
return nil, framework.NewStatus(framework.Error, err.Error())
return nil, framework.AsStatus(err)
}
if nnn == "" {
return nil, framework.NewStatus(framework.Unschedulable)

4
pkg/scheduler/framework/plugins/imagelocality/image_locality.go
View File

@ -53,12 +53,12 @@ func (pl *ImageLocality) Name() string {
func (pl *ImageLocality) Score(ctx context.Context, state *framework.CycleState, pod *v1.Pod, nodeName string) (int64, *framework.Status) {
nodeInfo, err := pl.handle.SnapshotSharedLister().NodeInfos().Get(nodeName)
if err != nil {
return 0, framework.NewStatus(framework.Error, fmt.Sprintf("getting node %q from Snapshot: %v", nodeName, err))
return 0, framework.AsStatus(fmt.Errorf("getting node %q from Snapshot: %w", nodeName, err))
}
nodeInfos, err := pl.handle.SnapshotSharedLister().NodeInfos().List()
if err != nil {
return 0, framework.NewStatus(framework.Error, err.Error())
return 0, framework.AsStatus(err)
}
totalNumNodes := len(nodeInfos)

6
pkg/scheduler/framework/plugins/nodeaffinity/node_affinity.go
View File

@ -65,12 +65,12 @@ func (pl *NodeAffinity) Filter(ctx context.Context, state *framework.CycleState,
func (pl *NodeAffinity) Score(ctx context.Context, state *framework.CycleState, pod *v1.Pod, nodeName string) (int64, *framework.Status) {
nodeInfo, err := pl.handle.SnapshotSharedLister().NodeInfos().Get(nodeName)
if err != nil {
return 0, framework.NewStatus(framework.Error, fmt.Sprintf("getting node %q from Snapshot: %v", nodeName, err))
return 0, framework.AsStatus(fmt.Errorf("getting node %q from Snapshot: %w", nodeName, err))
}
node := nodeInfo.Node()
if node == nil {
return 0, framework.NewStatus(framework.Error, fmt.Sprintf("getting node %q from Snapshot: %v", nodeName, err))
return 0, framework.AsStatus(fmt.Errorf("getting node %q from Snapshot: %w", nodeName, err))
}
affinity := pod.Spec.Affinity
@ -90,7 +90,7 @@ func (pl *NodeAffinity) Score(ctx context.Context, state *framework.CycleState,
// TODO: Avoid computing it for all nodes if this becomes a performance problem.
nodeSelector, err := v1helper.NodeSelectorRequirementsAsSelector(preferredSchedulingTerm.Preference.MatchExpressions)
if err != nil {
return 0, framework.NewStatus(framework.Error, err.Error())
return 0, framework.AsStatus(err)
}
if nodeSelector.Matches(labels.Set(node.Labels)) {