-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[release-1.12] fix potential panic on numa resources info updating in snapshot #4898
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: release-1.12
Are you sure you want to change the base?
[release-1.12] fix potential panic on numa resources info updating in snapshot #4898
Conversation
Signed-off-by: qi-min <qim_34@163.com>
Summary of ChangesHello @volcano-sh-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request addresses a critical issue that could lead to a panic during the update of NUMA resource information within the scheduler. The changes ensure that the NUMA scheduler information is always safely initialized and that resource maps are updated without encountering nil pointer dereferences or attempting to access non-existent map entries, thus improving the stability and reliability of the scheduler's resource management. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request fixes a potential panic in the NUMA resource information update logic. The changes introduce checks to handle cases where NumaSchedulerInfo is nil and when a resource is not found in the scheduler's resource map, preventing nil pointer dereferences. This makes the snapshotting process more robust.
I've added one comment with a suggestion to further improve the logic by handling the removal of NUMA resources, which would prevent the scheduler from using stale data.
| for resName, resInfo := range tmp.NumaResMap { | ||
| klog.V(5).Infof("resource %s Allocatable : current %v new %v on node %s", | ||
| resName, numaResMap[resName], resInfo, ni.Name) | ||
| if numaResMap[resName].Allocatable.Size() >= resInfo.Allocatable.Size() { | ||
| numaResMap[resName].Allocatable = resInfo.Allocatable.Clone() | ||
| numaResMap[resName].Capacity = resInfo.Capacity | ||
| if resourceInfo, ok := numaResMap[resName]; ok { | ||
| klog.V(5).Infof("resource %s Allocatable : current %v new %v on node %s", | ||
| resName, resourceInfo, resInfo, ni.Name) | ||
| if resourceInfo.Allocatable.Size() >= resInfo.Allocatable.Size() { | ||
| resourceInfo.Allocatable = resInfo.Allocatable.Clone() | ||
| resourceInfo.Capacity = resInfo.Capacity | ||
| } | ||
| } else { | ||
| numaResMap[resName] = resInfo | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change correctly fixes a potential panic when a resource exists in the new NUMA info but not in the scheduler's cached info. It also handles adding new resources.
However, it doesn't handle the case where a resource is removed from the node. In that scenario, the resource will not be in tmp.NumaResMap, so this loop won't execute for it. The stale resource will remain in ni.NumaSchedulerInfo.NumaResMap, which could lead to the scheduler making incorrect decisions based on outdated information.
To make the logic more robust, I suggest adding another loop to remove any resources from numaResMap that are no longer present in tmp.NumaResMap.
for resName, resInfo := range tmp.NumaResMap {
if resourceInfo, ok := numaResMap[resName]; ok {
klog.V(5).Infof("resource %s Allocatable : current %v new %v on node %s",
resName, resourceInfo, resInfo, ni.Name)
if resourceInfo.Allocatable.Size() >= resInfo.Allocatable.Size() {
resourceInfo.Allocatable = resInfo.Allocatable.Clone()
resourceInfo.Capacity = resInfo.Capacity
}
} else {
numaResMap[resName] = resInfo
}
}
for resName := range numaResMap {
if _, ok := tmp.NumaResMap[resName]; !ok {
delete(numaResMap, resName)
}
}
This is an automated cherry-pick of #4892