From 423b7b2c17f649e8a203394e2064548fb24f68a9 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu-zidif Date: Thu, 15 Jun 2017 16:09:18 +0800 Subject: [PATCH] fix-review --- plugin/pkg/scheduler/algorithm/predicates/predicates.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index 95939bf5043..35c944523f5 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -17,7 +17,6 @@ limitations under the License. package predicates import ( - "errors" "fmt" "math/rand" "strconv" @@ -1008,7 +1007,7 @@ func (c *PodAffinityChecker) InterPodAffinityMatches(pod *v1.Pod, meta interface // TODO: Do we really need any pod matching, or all pods matching? I think the latter. func (c *PodAffinityChecker) anyPodMatchesPodAffinityTerm(pod *v1.Pod, allPods []*v1.Pod, node *v1.Node, term *v1.PodAffinityTerm) (bool, bool, error) { if len(term.TopologyKey) == 0 { - return false, false, errors.New("Empty topologyKey is not allowed except for PreferredDuringScheduling pod anti-affinity") + return false, false, fmt.Errorf("empty topologyKey is not allowed except for PreferredDuringScheduling pod anti-affinity") } matchingPodExists := false namespaces := priorityutil.GetNamespacesFromPodAffinityTerm(pod, term) @@ -1248,7 +1247,7 @@ func PodToleratesNodeTaints(pod *v1.Pod, meta interface{}, nodeInfo *schedulerca return false, []algorithm.PredicateFailureReason{ErrTaintsTolerationsNotMatch}, nil } -// Determine if a pod is scheduled with best-effort QoS +// isPodBestEffort checks if pod is scheduled with best-effort QoS func isPodBestEffort(pod *v1.Pod) bool { return v1qos.GetPodQOS(pod) == v1.PodQOSBestEffort } @@ -1268,7 +1267,7 @@ func CheckNodeMemoryPressurePredicate(pod *v1.Pod, meta interface{}, nodeInfo *s return true, nil, nil } - // is node under presure? + // check if node is under memory preasure if nodeInfo.MemoryPressureCondition() == v1.ConditionTrue { return false, []algorithm.PredicateFailureReason{ErrNodeUnderMemoryPressure}, nil } @@ -1278,7 +1277,7 @@ func CheckNodeMemoryPressurePredicate(pod *v1.Pod, meta interface{}, nodeInfo *s // CheckNodeDiskPressurePredicate checks if a pod can be scheduled on a node // reporting disk pressure condition. func CheckNodeDiskPressurePredicate(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (bool, []algorithm.PredicateFailureReason, error) { - // is node under presure? + // check if node is under disk preasure if nodeInfo.DiskPressureCondition() == v1.ConditionTrue { return false, []algorithm.PredicateFailureReason{ErrNodeUnderDiskPressure}, nil }