- Notifications
You must be signed in to change notification settings - Fork927
chore: use container memory if containerised for oom notifications#17062
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
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
A container may not have a memory limit set. If there is no memory limitset, we want to fallback to using the memory available on the underlyinghost.
| } else { | ||
| mem, err = f.HostMemory(clistat.PrefixDefault) | ||
| if err != nil { | ||
| return 0, 0, xerrors.Errorf("failed to host fetch memory: %w", err) |
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.
Suggested change
| return0,0,xerrors.Errorf("failed tohostfetch memory: %w",err) | |
| return0,0,xerrors.Errorf("failed to fetch host memory: %w",err) |
| if mem.Total == nil { | ||
| hostMem, err := f.HostMemory(clistat.PrefixDefault) | ||
| if err != nil { | ||
| return 0, 0, xerrors.Errorf("failed to host fetch memory: %w", err) |
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.
Suggested change
| return0,0,xerrors.Errorf("failed tohostfetch memory: %w",err) | |
| return0,0,xerrors.Errorf("failed to fetch host memory: %w",err) |
johnstcn approved these changesMar 24, 2025
765e705 intomain 32 checks passed
Uh oh!
There was an error while loading.Please reload this page.
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
Labels
None yet
2 participants
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.
Uh oh!
There was an error while loading.Please reload this page.
Currently we query only the underlying host's memory usage for our memory resource monitor. This PR changes that to check if the workspace is in a container, and if so it queries the container's memory usage, falling back to the host's memory usage if not.