mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 10:20:51 +00:00
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:
parent
34c2672115
commit
bf2fc250a4
@ -121,17 +121,19 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
|
|||||||
framework.ConformanceIt("validates basic preemption works", func() {
|
framework.ConformanceIt("validates basic preemption works", func() {
|
||||||
var podRes v1.ResourceList
|
var podRes v1.ResourceList
|
||||||
|
|
||||||
// Create one pod per node that uses a lot of the node's resources.
|
// Create two pods per node that uses a lot of the node's resources.
|
||||||
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))
|
pods := make([]*v1.Pod, 0, 2*len(nodeList.Items))
|
||||||
// Now create victim pods on each of the node with lower priority
|
// Create pods in the cluster.
|
||||||
|
// One of them has low priority, making it the victim for preemption.
|
||||||
for i, node := range nodeList.Items {
|
for i, node := range nodeList.Items {
|
||||||
// Update each node to advertise 3 available extended resources
|
// Update each node to advertise 3 available extended resources
|
||||||
nodeCopy := node.DeepCopy()
|
nodeCopy := node.DeepCopy()
|
||||||
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("3")
|
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5")
|
||||||
err := patchNode(cs, &node, nodeCopy)
|
err := patchNode(cs, &node, nodeCopy)
|
||||||
framework.ExpectNoError(err)
|
framework.ExpectNoError(err)
|
||||||
|
|
||||||
|
for j := 0; j < 2; j++ {
|
||||||
// Request 2 of the available resources for the victim pods
|
// Request 2 of the available resources for the victim pods
|
||||||
podRes = v1.ResourceList{}
|
podRes = v1.ResourceList{}
|
||||||
podRes[testExtendedResource] = resource.MustParse("2")
|
podRes[testExtendedResource] = resource.MustParse("2")
|
||||||
@ -141,8 +143,8 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
|
|||||||
if len(pods) == 0 {
|
if len(pods) == 0 {
|
||||||
priorityName = lowPriorityClassName
|
priorityName = lowPriorityClassName
|
||||||
}
|
}
|
||||||
pods = append(pods, createPausePod(f, pausePodConfig{
|
pausePod := createPausePod(f, pausePodConfig{
|
||||||
Name: fmt.Sprintf("pod%d-%v", i, priorityName),
|
Name: fmt.Sprintf("pod%d-%d-%v", i, j, priorityName),
|
||||||
PriorityClassName: priorityName,
|
PriorityClassName: priorityName,
|
||||||
Resources: &v1.ResourceRequirements{
|
Resources: &v1.ResourceRequirements{
|
||||||
Requests: podRes,
|
Requests: podRes,
|
||||||
@ -161,8 +163,10 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}))
|
})
|
||||||
framework.Logf("Created pod: %v", pods[i].Name)
|
pods = append(pods, pausePod)
|
||||||
|
framework.Logf("Created pod: %v", pausePod.Name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if len(pods) < 2 {
|
if len(pods) < 2 {
|
||||||
framework.Failf("We need at least two pods to be created but " +
|
framework.Failf("We need at least two pods to be created but " +
|
||||||
@ -209,15 +213,16 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
|
|||||||
framework.ConformanceIt("validates lower priority pod preemption by critical pod", func() {
|
framework.ConformanceIt("validates lower priority pod preemption by critical pod", func() {
|
||||||
var podRes v1.ResourceList
|
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))
|
pods := make([]*v1.Pod, 0, len(nodeList.Items))
|
||||||
for i, node := range nodeList.Items {
|
for i, node := range nodeList.Items {
|
||||||
// Update each node to advertise 3 available extended resources
|
// Update each node to advertise 3 available extended resources
|
||||||
nodeCopy := node.DeepCopy()
|
nodeCopy := node.DeepCopy()
|
||||||
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("3")
|
nodeCopy.Status.Capacity[testExtendedResource] = resource.MustParse("5")
|
||||||
err := patchNode(cs, &node, nodeCopy)
|
err := patchNode(cs, &node, nodeCopy)
|
||||||
framework.ExpectNoError(err)
|
framework.ExpectNoError(err)
|
||||||
|
|
||||||
|
for j := 0; j < 2; j++ {
|
||||||
// Request 2 of the available resources for the victim pods
|
// Request 2 of the available resources for the victim pods
|
||||||
podRes = v1.ResourceList{}
|
podRes = v1.ResourceList{}
|
||||||
podRes[testExtendedResource] = resource.MustParse("2")
|
podRes[testExtendedResource] = resource.MustParse("2")
|
||||||
@ -227,8 +232,8 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
|
|||||||
if len(pods) == 0 {
|
if len(pods) == 0 {
|
||||||
priorityName = lowPriorityClassName
|
priorityName = lowPriorityClassName
|
||||||
}
|
}
|
||||||
pods = append(pods, createPausePod(f, pausePodConfig{
|
pausePod := createPausePod(f, pausePodConfig{
|
||||||
Name: fmt.Sprintf("pod%d-%v", i, priorityName),
|
Name: fmt.Sprintf("pod%d-%d-%v", i, j, priorityName),
|
||||||
PriorityClassName: priorityName,
|
PriorityClassName: priorityName,
|
||||||
Resources: &v1.ResourceRequirements{
|
Resources: &v1.ResourceRequirements{
|
||||||
Requests: podRes,
|
Requests: podRes,
|
||||||
@ -247,8 +252,10 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}))
|
})
|
||||||
framework.Logf("Created pod: %v", pods[i].Name)
|
pods = append(pods, pausePod)
|
||||||
|
framework.Logf("Created pod: %v", pausePod.Name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if len(pods) < 2 {
|
if len(pods) < 2 {
|
||||||
framework.Failf("We need at least two pods to be created but " +
|
framework.Failf("We need at least two pods to be created but " +
|
||||||
|
Loading…
Reference in New Issue
Block a user