[release-4.18] [KNI][upstream] nrt: log: return updated generation value for cache #357
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shajmakh
force-pushed
the
cherrypick-nrtfix
branch
2 times, most recently
from
1231a20 to
0ff8290
Compare
shajmakh
changed the title
ffromani
reviewed
Jun 17, 2025
shajmakh
changed the title
shajmakh
force-pushed
the
cherrypick-nrtfix
branch
2 times, most recently
from
fbf46ba to
4b94c85
Compare
shajmakh
force-pushed
the
cherrypick-nrtfix
branch
from
4b94c85 to
8e09e67
Compare
shajmakh
changed the title
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]> (cherry picked from commit 4bf93e9)
Add a unit test mainly for GetCachedNRTCopy() to verify the returned generation. To help with the verification, make FlushNodes not only report about the new generation (which only updated there) but also return it so we'd be able to compare the values. Signed-off-by: Shereen Haj <[email protected]> (cherry picked from commit ffe2ce2)
|
/approve this follow the new process we agreed upon in #373 |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ffromani, shajmakh The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
openshift-merge-bot
bot
merged commit 0bffcad
into
openshift-kni:release-4.18
10 checks passed
shajmakh
added a commit
to shajmakh/scheduler-plugins
that referenced
this pull request
Jun 20, 2025
Update RESYNC.log.md to reflect the cherry-picked commits in openshift-kni#357 Signed-off-by: Shereen Haj <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick nrt log fix from upstream and skip commit verification for cherrypick-prefixed branches.