Skip to content

Conversation

@volcano-sh-bot
Copy link
Contributor

This is an automated cherry-pick of #4892


@gemini-code-assist
Copy link

Summary of Changes

Hello @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

  • Panic Prevention: Introduced a nil check for ni.NumaSchedulerInfo to prevent potential panics when the NUMA scheduler information is being initialized or updated, ensuring robust operation.
  • Resource Map Safety: Enhanced the logic for updating NUMA resource maps (numaResMap) to safely handle cases where new resources might be introduced. The code now explicitly checks for the existence of a resource before attempting to update it, adding new resources if they are not found, thereby preventing panics.

🧠 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 Assist

The 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 /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

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 .gemini/ folder in the base of the repository. Detailed instructions can be found here.

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

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@volcano-sh-bot
Copy link
Contributor Author

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign wangyang0616 for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@volcano-sh-bot volcano-sh-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 31, 2025
Copy link

@gemini-code-assist gemini-code-assist bot left a 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.

Comment on lines 190 to 201
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
}
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

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)
			}
		}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants