validates basic preemption works|validates lower priority pod preemption by critical pod: allocate 4/5 instead of 2/3

To run the tests in a single node cluster, create two pods consuming 2/5 of the extended resource instead of one consuming 2/3.
The low priority pod will be consuming 2/5 of the extended resource instead so in case there's only a single node,
a high priority pod consuming 2/5 of the extended resource can be still scheduled. Thus, making sure only the low priority pod
gets preempted once the preemptor pod consuming 2/5 of the extended resource gets scheduled while keeping the high priority pod untouched.
This commit is contained in:
Jan Chaloupka 2021-03-11 12:39:59 +01:00
parent 34c2672115
commit bf2fc250a4

View File

@ -121,48 +121,52 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
framework.ConformanceIt("validates basic preemption works", func() {
var podRes v1.ResourceList
// Create one pod per node that uses a lot of the node's resources.
ginkgo.By("Create pods that use 2/3 of node resources.")
pods := make([]*v1.Pod, 0, len(nodeList.Items))
// Now create victim pods on each of the node with lower priority
// Create two pods per node that uses a lot of the node's resources.
ginkgo.By("Create pods that use 4/5 of node resources.")
pods := make([]*v1.Pod, 0, 2*len(nodeList.Items))
// Create pods in the cluster.
// One of them has low priority, making it the victim for preemption.
for i, node := range nodeList.Items {
// Update each node to advertise 3 available extended resources
nodeCopy := node.DeepCopy()
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("3")
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5")
err := patchNode(cs, &node, nodeCopy)
framework.ExpectNoError(err)
// Request 2 of the available resources for the victim pods
podRes = v1.ResourceList{}
podRes[testExtendedResource] = resource.MustParse("2")
for j := 0; j < 2; j++ {
// Request 2 of the available resources for the victim pods
podRes = v1.ResourceList{}
podRes[testExtendedResource] = resource.MustParse("2")
// make the first pod low priority and the rest medium priority.
priorityName := mediumPriorityClassName
if len(pods) == 0 {
priorityName = lowPriorityClassName
}
pods = append(pods, createPausePod(f, pausePodConfig{
Name: fmt.Sprintf("pod%d-%v", i, priorityName),
PriorityClassName: priorityName,
Resources: &v1.ResourceRequirements{
Requests: podRes,
Limits: podRes,
},
Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
NodeSelectorTerms: []v1.NodeSelectorTerm{
{
MatchFields: []v1.NodeSelectorRequirement{
{Key: "metadata.name", Operator: v1.NodeSelectorOpIn, Values: []string{node.Name}},
// make the first pod low priority and the rest medium priority.
priorityName := mediumPriorityClassName
if len(pods) == 0 {
priorityName = lowPriorityClassName
}
pausePod := createPausePod(f, pausePodConfig{
Name: fmt.Sprintf("pod%d-%d-%v", i, j, priorityName),
PriorityClassName: priorityName,
Resources: &v1.ResourceRequirements{
Requests: podRes,
Limits: podRes,
},
Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
NodeSelectorTerms: []v1.NodeSelectorTerm{
{
MatchFields: []v1.NodeSelectorRequirement{
{Key: "metadata.name", Operator: v1.NodeSelectorOpIn, Values: []string{node.Name}},
},
},
},
},
},
},
},
}))
framework.Logf("Created pod: %v", pods[i].Name)
})
pods = append(pods, pausePod)
framework.Logf("Created pod: %v", pausePod.Name)
}
}
if len(pods) < 2 {
framework.Failf("We need at least two pods to be created but " +
@ -209,46 +213,49 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
framework.ConformanceIt("validates lower priority pod preemption by critical pod", func() {
var podRes v1.ResourceList
ginkgo.By("Create pods that use 2/3 of node resources.")
ginkgo.By("Create pods that use 4/5 of node resources.")
pods := make([]*v1.Pod, 0, len(nodeList.Items))
for i, node := range nodeList.Items {
// Update each node to advertise 3 available extended resources
nodeCopy := node.DeepCopy()
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("3")
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5")
err := patchNode(cs, &node, nodeCopy)
framework.ExpectNoError(err)
// Request 2 of the available resources for the victim pods
podRes = v1.ResourceList{}
podRes[testExtendedResource] = resource.MustParse("2")
for j := 0; j < 2; j++ {
// Request 2 of the available resources for the victim pods
podRes = v1.ResourceList{}
podRes[testExtendedResource] = resource.MustParse("2")
// make the first pod low priority and the rest medium priority.
priorityName := mediumPriorityClassName
if len(pods) == 0 {
priorityName = lowPriorityClassName
}
pods = append(pods, createPausePod(f, pausePodConfig{
Name: fmt.Sprintf("pod%d-%v", i, priorityName),
PriorityClassName: priorityName,
Resources: &v1.ResourceRequirements{
Requests: podRes,
Limits: podRes,
},
Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
NodeSelectorTerms: []v1.NodeSelectorTerm{
{
MatchFields: []v1.NodeSelectorRequirement{
{Key: "metadata.name", Operator: v1.NodeSelectorOpIn, Values: []string{node.Name}},
// make the first pod low priority and the rest medium priority.
priorityName := mediumPriorityClassName
if len(pods) == 0 {
priorityName = lowPriorityClassName
}
pausePod := createPausePod(f, pausePodConfig{
Name: fmt.Sprintf("pod%d-%d-%v", i, j, priorityName),
PriorityClassName: priorityName,
Resources: &v1.ResourceRequirements{
Requests: podRes,
Limits: podRes,
},
Affinity: &v1.Affinity{
NodeAffinity: &v1.NodeAffinity{
RequiredDuringSchedulingIgnoredDuringExecution: &v1.NodeSelector{
NodeSelectorTerms: []v1.NodeSelectorTerm{
{
MatchFields: []v1.NodeSelectorRequirement{
{Key: "metadata.name", Operator: v1.NodeSelectorOpIn, Values: []string{node.Name}},
},
},
},
},
},
},
},
}))
framework.Logf("Created pod: %v", pods[i].Name)
})
pods = append(pods, pausePod)
framework.Logf("Created pod: %v", pausePod.Name)
}
}
if len(pods) < 2 {
framework.Failf("We need at least two pods to be created but " +