github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24178 from HaiyangDING/predlib2

Browse Source 
Automatic merge from submit-queue

change predicate error format.

@davidopp @dchen1107 @mikedanese @yujuhong 

follow #20204.

address [FakePredicateError](https://github.com/kubernetes/kubernetes/pull/20204#discussion_r59237270) and [ErrFakePredicate](https://github.com/kubernetes/kubernetes/pull/20204#discussion_r59273190)

As for the rest suggestions ([NoDiskConflict](https://github.com/kubernetes/kubernetes/pull/20204#discussion_r59237340) and [NoVolumeZoneConflict](https://github.com/kubernetes/kubernetes/pull/20204#discussion_r59237419)), I would prefer to leave them as they now, for the reason given by @davidopp
This commit is contained in:
k8s-merge-robot 2016-04-17 13:12:55 -07:00
commit 3924c9a6f1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/pkg/scheduler/algorithm/predicates/error.go
View File

@ -35,9 +35,9 @@ var (
ErrNodeLabelPresenceViolated = newPredicateFailureError("CheckNodeLabelPresence") ErrNodeLabelPresenceViolated = newPredicateFailureError("CheckNodeLabelPresence")
ErrServiceAffinityViolated = newPredicateFailureError("CheckServiceAffinity") ErrServiceAffinityViolated = newPredicateFailureError("CheckServiceAffinity")
ErrMaxVolumeCountExceeded = newPredicateFailureError("MaxVolumeCount") ErrMaxVolumeCountExceeded = newPredicateFailureError("MaxVolumeCount")
// ErrFakePredicateError is used for test only. The fake predicates returning false also returns error // ErrFakePredicate is used for test only. The fake predicates returning false also returns error
// as ErrFakePredicateError. // as ErrFakePredicate.
ErrFakePredicateError = newPredicateFailureError("false") ErrFakePredicate = newPredicateFailureError("FakePredicateError")
) )
// InsufficientResourceError is an error type that indicates what kind of resource limit is // InsufficientResourceError is an error type that indicates what kind of resource limit is

14
plugin/pkg/scheduler/generic_scheduler_test.go
View File

@ -34,7 +34,7 @@ import (
) )
func falsePredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.NodeInfo) (bool, error) { func falsePredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.NodeInfo) (bool, error) {
return false, algorithmpredicates.ErrFakePredicateError return false, algorithmpredicates.ErrFakePredicate
} }
func truePredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.NodeInfo) (bool, error) { func truePredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.NodeInfo) (bool, error) {
@ -45,14 +45,14 @@ func matchesPredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.No
if pod.Name == nodeName { if pod.Name == nodeName {
return true, nil return true, nil
} }
return false, algorithmpredicates.ErrFakePredicateError return false, algorithmpredicates.ErrFakePredicate
} }
func hasNoPodsPredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.NodeInfo) (bool, error) { func hasNoPodsPredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.NodeInfo) (bool, error) {
if len(nodeInfo.Pods()) == 0 { if len(nodeInfo.Pods()) == 0 {
return true, nil return true, nil
} }
return false, algorithmpredicates.ErrFakePredicateError return false, algorithmpredicates.ErrFakePredicate
} }
func numericPriority(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodeLister algorithm.NodeLister) (schedulerapi.HostPriorityList, error) { func numericPriority(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodeLister algorithm.NodeLister) (schedulerapi.HostPriorityList, error) {
@ -192,7 +192,7 @@ func TestGenericScheduler(t *testing.T) {
nodes: []string{"machine1", "machine2"}, nodes: []string{"machine1", "machine2"},
expectsErr: true, expectsErr: true,
name: "test 1", name: "test 1",
wErr: algorithmpredicates.ErrFakePredicateError, wErr: algorithmpredicates.ErrFakePredicate,
}, },
{ {
predicates: map[string]algorithm.FitPredicate{"true": truePredicate}, predicates: map[string]algorithm.FitPredicate{"true": truePredicate},
@ -313,7 +313,7 @@ func TestFindFitAllError(t *testing.T) {
if !found { if !found {
t.Errorf("failed to find node: %s in %v", node, predicateMap) t.Errorf("failed to find node: %s in %v", node, predicateMap)
} }
if failure != "false" { if failure != "FakePredicateError" {
t.Errorf("unexpected failures: %v", failure) t.Errorf("unexpected failures: %v", failure)
} }
} }
@ -330,7 +330,7 @@ func TestFindFitSomeError(t *testing.T) {
} }
_, predicateMap, err := findNodesThatFit(pod, nodeNameToInfo, predicates, makeNodeList(nodes), nil) _, predicateMap, err := findNodesThatFit(pod, nodeNameToInfo, predicates, makeNodeList(nodes), nil)
if err != nil && !reflect.DeepEqual(err, algorithmpredicates.ErrFakePredicateError) { if err != nil && !reflect.DeepEqual(err, algorithmpredicates.ErrFakePredicate) {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -346,7 +346,7 @@ func TestFindFitSomeError(t *testing.T) {
if !found { if !found {
t.Errorf("failed to find node: %s in %v", node, predicateMap) t.Errorf("failed to find node: %s in %v", node, predicateMap)
} }
if failure != "false" { if failure != "FakePredicateError" {
t.Errorf("unexpected failures: %v", failure) t.Errorf("unexpected failures: %v", failure)
} }
} }