chore: use container memory if containerised for oom notifications #17062
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 limit set, we want to fallback to using the memory available on the underlying host.
johnstcn
reviewed
Mar 24, 2025
| } 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.
Suggested change
| return 0, 0, xerrors.Errorf("failed to host fetch memory: %w", err) | |
| return 0, 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.
Suggested change
| return 0, 0, xerrors.Errorf("failed to host fetch memory: %w", err) | |
| return 0, 0, xerrors.Errorf("failed to fetch host memory: %w", err) |
johnstcn
approved these changes
Mar 24, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
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.