Skip to content

Commit 4bf93e9

Browse files
committed
nrt: log: return updated generation value for cache
The logs show misaligned generation value when tackling the same node in overreserve.go and filter.go logs where the former is always up to date while the latter is never updated (generation=0): ``` 1 overreserve.go:310] "NodeTopology podset fingerprint mismatch" logger="nrtcache.resync" generation=3 node="node-1" ... 1 filter.go:202] "invalid topology data" logger="FilterWithNominatedPods.Filter.NodeResourceTopologyMatch" pod="default/test-6f798bf799-tj7bc" pod="default/test-6f798bf799-tj7bc" podUID="f221ce7c-09c9-4462-a67a-95f5fdec3fb7" node="node-1" generation=0 ``` The only cache implementation that defines and uses "generation" is OverReserve thus this commit updates the method GetCachedNRTCopy() to return updated generation value in the returned CachedNRTInfo. Signed-off-by: Shereen Haj <[email protected]>
1 parent f071739 commit 4bf93e9

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

pkg/noderesourcetopology/cache/overreserve.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,16 @@ func NewOverReserve(ctx context.Context, lh logr.Logger, cfg *apiconfig.NodeReso
101101
func (ov *OverReserve) GetCachedNRTCopy(ctx context.Context, nodeName string, pod *corev1.Pod) (*topologyv1alpha2.NodeResourceTopology, CachedNRTInfo) {
102102
ov.lock.Lock()
103103
defer ov.lock.Unlock()
104+
info := CachedNRTInfo{Generation: ov.generation}
104105
if ov.nodesWithForeignPods.IsSet(nodeName) {
105-
return nil, CachedNRTInfo{}
106+
return nil, info
106107
}
107108

108-
info := CachedNRTInfo{Fresh: true}
109+
info.Fresh = true
109110
nrt := ov.nrts.GetNRTCopyByNodeName(nodeName)
110111
if nrt == nil {
111112
return nil, info
112113
}
113-
114-
info.Generation = ov.generation
115114
nodeAssumedResources, ok := ov.assumedResources[nodeName]
116115
if !ok {
117116
return nrt, info

0 commit comments

Comments
 (0)