1/ allowed Assume() to add an object that is not present in the cache (assumce_cache.go).

yliaog · yliaog · commit 35ce93bca964 · 2025-07-30T18:12:46.000Z
2/ returned the err from Assume() in PreBind phase (dynamicresources.go)
3/ added wait for informer in postFilter verification test
(dynamicresources_test.go).
diff --git a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go
@@ -1447,7 +1447,7 @@ func (pl *DynamicResources) bindClaim(ctx context.Context, state *stateData, ind
 				// This can fail, but only for reasons that are okay (concurrent delete or update).
 				// Shouldn't happen in this case.
 				if err := pl.draManager.ResourceClaims().AssumeClaimAfterAPICall(claim); err != nil {
-					logger.V(5).Info("Claim not stored in assume cache", "err", finalErr)
+					logger.V(5).Info("Claim not stored in assume cache", "err", err)
 				}
 			}
 			for _, claimUID := range claimUIDs {
diff --git a/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go b/pkg/scheduler/framework/plugins/dynamicresources/dynamicresources_test.go
@@ -1317,7 +1317,7 @@ func TestPlugin(t *testing.T) {
 				},
 				postfilter: result{
 					status:  fwk.NewStatus(fwk.Unschedulable, `deletion of ResourceClaim completed`),
-					removed: []metav1.Object{extendedResourceClaimNode2},
+					removed: []metav1.Object{extendedResourceClaim},
 				},
 			},
 		},
@@ -1326,6 +1326,7 @@ func TestPlugin(t *testing.T) {
 			pod:                       podWithExtendedResourceName,
 			claims:                    []*resourceapi.ResourceClaim{extendedResourceClaimNode2},
 			classes:                   []*resourceapi.DeviceClass{deviceClassWithExtendResourceName},
+			objs:                      []apiruntime.Object{workerNodeSlice, podWithExtendedResourceName},
 			want: want{
 				filter: perNodeResult{
 					workerNode.Name: {
@@ -1844,6 +1845,10 @@ func TestPlugin(t *testing.T) {
 				result, status := testCtx.p.PostFilter(testCtx.ctx, testCtx.state, tc.pod, nil /* filteredNodeStatusMap not used by plugin */)
 				t.Run("postfilter", func(t *testing.T) {
 					assert.Equal(t, tc.want.postFilterResult, result)
+					// in case we delete the claim API object
+					// wait for assumed cache to sync with informer
+					// then assumed cache should be empty
+					time.Sleep(800 * time.Millisecond)
 					testCtx.verify(t, tc.want.postfilter, initialObjects, nil, status)
 				})
 			}
diff --git a/pkg/scheduler/util/assumecache/assume_cache.go b/pkg/scheduler/util/assumecache/assume_cache.go
@@ -436,7 +436,13 @@ func (c *AssumeCache) Assume(obj interface{}) error {
 
 	objInfo, err := c.getObjInfo(name)
 	if err != nil {
-		return err
+		if !errors.Is(err, ErrNotFound) {
+			return err
+		} else {
+			c.add(obj)
+			c.logger.V(4).Info("Added object", "description", c.description, "cacheKey", name)
+			return nil
+		}
 	}
 
 	newVersion, err := c.getObjVersion(name, obj)

Original file line number	Diff line number	Diff line change
`@@ -1447,7 +1447,7 @@ func (pl DynamicResources) bindClaim(ctx context.Context, state stateData, ind`
`1447`	`1447`	`// This can fail, but only for reasons that are okay (concurrent delete or update).`
`1448`	`1448`	`// Shouldn't happen in this case.`
`1449`	`1449`	`if err := pl.draManager.ResourceClaims().AssumeClaimAfterAPICall(claim); err != nil {`
`1450`		`- logger.V(5).Info("Claim not stored in assume cache", "err", finalErr)`
	`1450`	`+ logger.V(5).Info("Claim not stored in assume cache", "err", err)`
`1451`	`1451`	`}`
`1452`	`1452`	`}`
`1453`	`1453`	`for _, claimUID := range claimUIDs {`