From 8c51c9955c1f68624aba094af2a293fc29787079 Mon Sep 17 00:00:00 2001
From: SataQiu <1527062125@qq.com>
Date: Fri, 25 Sep 2020 10:38:27 +0800
Subject: [PATCH] wrap errors from DefaultPreemption, ImageLocality and 
 NodeAffinity plugins

---
 .../plugins/defaultpreemption/default_preemption.go         | 2 +-
 .../framework/plugins/imagelocality/image_locality.go       | 4 ++--
 .../framework/plugins/nodeaffinity/node_affinity.go         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go
index 31186b4484b..1ac61802eb3 100644
--- a/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go
+++ b/pkg/scheduler/framework/plugins/defaultpreemption/default_preemption.go
@@ -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)
diff --git a/pkg/scheduler/framework/plugins/imagelocality/image_locality.go b/pkg/scheduler/framework/plugins/imagelocality/image_locality.go
index 4eb61c7ad1b..ae75b566432 100644
--- a/pkg/scheduler/framework/plugins/imagelocality/image_locality.go
+++ b/pkg/scheduler/framework/plugins/imagelocality/image_locality.go
@@ -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)
 
diff --git a/pkg/scheduler/framework/plugins/nodeaffinity/node_affinity.go b/pkg/scheduler/framework/plugins/nodeaffinity/node_affinity.go
index 4309c00be83..53fe150d354 100644
--- a/pkg/scheduler/framework/plugins/nodeaffinity/node_affinity.go
+++ b/pkg/scheduler/framework/plugins/nodeaffinity/node_affinity.go
@@ -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)) {