github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The Pod is eligible to preempt when previous nominanted node is UnschedulableAndUnresolvable

Browse Source 
If the Pod's previous nominated node is UnschedulableAndUnresolvable from previous
filtering, it should be considered for preemption again.
This commit is contained in:
He Jie Xu
2020-06-29 16:43:59 +08:00
parent 6cedc0853f
commit b3741f344e
3 changed files with 69 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
pkg/scheduler/framework/plugins/defaultpreemption/default_preemption_test.go
View File

@@ -889,6 +889,61 @@ func TestPickOneNodeForPreemption(t *testing.T) {
}
}
func TestPodEligibleToPreemptOthers(t *testing.T) {
tests := []struct {
name string
pod *v1.Pod
pods []*v1.Pod
nodes []string
nominatedNodeStatus *framework.Status
expected bool
}{
{
name: "Pod with nominated node",
pod: st.MakePod().Name("p_with_nominated_node").UID("p").Priority(highPriority).NominatedNodeName("node1").Obj(),
pods: []*v1.Pod{st.MakePod().Name("p1").UID("p1").Priority(lowPriority).Node("node1").Terminating().Obj()},
nodes: []string{"node1"},
nominatedNodeStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, tainttoleration.ErrReasonNotMatch),
expected: true,
},
{
name: "Pod with nominated node, but without nominated node status",
pod: st.MakePod().Name("p_without_status").UID("p").Priority(highPriority).NominatedNodeName("node1").Obj(),
pods: []*v1.Pod{st.MakePod().Name("p1").UID("p1").Priority(lowPriority).Node("node1").Terminating().Obj()},
nodes: []string{"node1"},
nominatedNodeStatus: nil,
expected: false,
},
{
name: "Pod without nominated node",
pod: st.MakePod().Name("p_without_nominated_node").UID("p").Priority(highPriority).Obj(),
pods: []*v1.Pod{},
nodes: []string{},
nominatedNodeStatus: nil,
expected: true,
},
{
name: "Pod with 'PreemptNever' preemption policy",
pod: st.MakePod().Name("p_with_preempt_never_policy").UID("p").Priority(highPriority).PreemptionPolicy(v1.PreemptNever).Obj(),
pods: []*v1.Pod{},
nodes: []string{},
nominatedNodeStatus: nil,
expected: false,
},
}
for _, test := range tests {
var nodes []*v1.Node
for _, n := range test.nodes {
nodes = append(nodes, st.MakeNode().Name(n).Obj())
}
snapshot := internalcache.NewSnapshot(test.pods, nodes)
if got := podEligibleToPreemptOthers(test.pod, snapshot.NodeInfos(), test.nominatedNodeStatus); got != test.expected {
t.Errorf("expected %t, got %t for pod: %s", test.expected, got, test.pod.Name)
}
}
}
func TestNodesWherePreemptionMightHelp(t *testing.T) {
// Prepare 4 nodes names.
nodeNames := []string{"node1", "node2", "node3", "node4"}