github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 03:57:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #119195 from pohly/dra-reallocate-flake

Browse Source 
dra e2e: fix "reallocation works" flake
This commit is contained in:
Kubernetes Prow Robot 2023-07-12 05:55:25 -07:00 committed by GitHub
commit 3cc729fc7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/e2e/dra/dra.go
View File

@ -461,14 +461,14 @@ var _ = ginkgo.Describe("[sig-node] DRA [Feature:DynamicResourceAllocation]", fu
driver := NewDriver(f, nodes, func() app.Resources { driver := NewDriver(f, nodes, func() app.Resources {
return app.Resources{ return app.Resources{
NodeLocal: true, NodeLocal: true,
MaxAllocations: 2, MaxAllocations: 1,
Nodes: nodes.NodeNames, Nodes: nodes.NodeNames,
} }
}) })
driver2 := NewDriver(f, nodes, func() app.Resources { driver2 := NewDriver(f, nodes, func() app.Resources {
return app.Resources{ return app.Resources{
NodeLocal: true, NodeLocal: true,
MaxAllocations: 2, MaxAllocations: 1,
Nodes: nodes.NodeNames, Nodes: nodes.NodeNames,
AllocateWrapper: func( AllocateWrapper: func(
@ -507,35 +507,27 @@ var _ = ginkgo.Describe("[sig-node] DRA [Feature:DynamicResourceAllocation]", fu
parameters1 := b.parameters() parameters1 := b.parameters()
parameters2 := b2.parameters() parameters2 := b2.parameters()
pod1 := b.podExternal() // Order is relevant here: each pod must be matched with its own claim.
pod2 := b2.podExternal()
pod1claim1 := b.externalClaim(resourcev1alpha2.AllocationModeWaitForFirstConsumer) pod1claim1 := b.externalClaim(resourcev1alpha2.AllocationModeWaitForFirstConsumer)
pod1 := b.podExternal()
pod2claim1 := b2.externalClaim(resourcev1alpha2.AllocationModeWaitForFirstConsumer) pod2claim1 := b2.externalClaim(resourcev1alpha2.AllocationModeWaitForFirstConsumer)
pod1claim2 := b2.externalClaim(resourcev1alpha2.AllocationModeWaitForFirstConsumer) pod2 := b2.podExternal()
pod1claim3 := b2.externalClaim(resourcev1alpha2.AllocationModeWaitForFirstConsumer)
// Add another claim to pod1.
pod1claim2 := b2.externalClaim(resourcev1alpha2.AllocationModeWaitForFirstConsumer)
pod1.Spec.ResourceClaims = append(pod1.Spec.ResourceClaims, pod1.Spec.ResourceClaims = append(pod1.Spec.ResourceClaims,
v1.PodResourceClaim{ v1.PodResourceClaim{
Name: "claim-other1", Name: "claim-other",
Source: v1.ClaimSource{ Source: v1.ClaimSource{
ResourceClaimName: &pod1claim2.Name, ResourceClaimName: &pod1claim2.Name,
}, },
}, },
v1.PodResourceClaim{
Name: "claim-other2",
Source: v1.ClaimSource{
ResourceClaimName: &pod1claim3.Name,
},
},
) )
// Block on the second, third external claim from driver2 that is to be allocated. // Allocating the second claim in pod1 has to wait until pod2 has
// consumed the available resources on the node.
blockClaim, cancelBlockClaim := context.WithCancel(ctx) blockClaim, cancelBlockClaim := context.WithCancel(ctx)
defer cancelBlockClaim() defer cancelBlockClaim()
b2.create(ctx, parameters2, pod1claim2, pod1claim3)
b.create(ctx, parameters1, pod1claim1, pod1)
allocateWrapper2 = func(ctx context.Context, allocateWrapper2 = func(ctx context.Context,
claimAllocations []*controller.ClaimAllocation, claimAllocations []*controller.ClaimAllocation,
selectedNode string, selectedNode string,
@ -543,15 +535,15 @@ var _ = ginkgo.Describe("[sig-node] DRA [Feature:DynamicResourceAllocation]", fu
claimAllocations []*controller.ClaimAllocation, claimAllocations []*controller.ClaimAllocation,
selectedNode string), selectedNode string),
) { ) {
// pod1 will have only external-claim[2-3], it has to wait if claimAllocations[0].Claim.Name == pod1claim2.Name {
// for pod2 to consume resources from driver2
if claimAllocations[0].Claim.Name != "external-claim-other" {
<-blockClaim.Done() <-blockClaim.Done()
} }
handler(ctx, claimAllocations, selectedNode) handler(ctx, claimAllocations, selectedNode)
return return
} }
b.create(ctx, parameters1, parameters2, pod1claim1, pod1claim2, pod1)
ginkgo.By("waiting for one claim from driver1 to be allocated") ginkgo.By("waiting for one claim from driver1 to be allocated")
var nodeSelector *v1.NodeSelector var nodeSelector *v1.NodeSelector
gomega.Eventually(ctx, func(ctx context.Context) (int, error) { gomega.Eventually(ctx, func(ctx context.Context) (int, error) {
@ -583,7 +575,7 @@ var _ = ginkgo.Describe("[sig-node] DRA [Feature:DynamicResourceAllocation]", fu
b2.create(ctx, pod2claim1, pod2) b2.create(ctx, pod2claim1, pod2)
framework.ExpectNoError(e2epod.WaitForPodRunningInNamespace(ctx, f.ClientSet, pod2), "start pod 2") framework.ExpectNoError(e2epod.WaitForPodRunningInNamespace(ctx, f.ClientSet, pod2), "start pod 2")
// Allow allocation of pod1 claim2, claim3 to proceed. It should fail now // Allow allocation of second claim in pod1 to proceed. It should fail now
// and the other node must be used instead, after deallocating // and the other node must be used instead, after deallocating
// the first claim. // the first claim.
ginkgo.By("move first pod to other node") ginkgo.By("move first pod to other node")