Skip to content

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Mar 24, 2025
Merged

chore: use container memory if containerised for oom notifications #17062

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87adb1d
chore: query container memory if available
DanielleMaywood Mar 23, 2025
1e28ae7
chore: fallback to host memory limit
DanielleMaywood Mar 24, 2025
0a96813
chore: add error handling
DanielleMaywood Mar 24, 2025
f1dc9f7
chore: error handling
DanielleMaywood Mar 24, 2025
a2182e1
chore: add tests
DanielleMaywood Mar 24, 2025
1df4073
chore: appease linter
DanielleMaywood Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: fallback to host memory limit 
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.
  • Loading branch information
@DanielleMaywood
DanielleMaywood committed Mar 24, 2025
commit 1e28ae70d9b3dfd37f24dda858727c04f6e933fb
16 changes: 14 additions & 2 deletions agent/proto/resourcesmonitor/fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,24 @@ func (f *fetcher) FetchMemory() (total int64, used int64, err error) {
if f.isContainerized {
mem, err = f.ContainerMemory(clistat.PrefixDefault)
if err != nil {
return 0, 0, xerrors.Errorf("failed to fetch memory: %w", err)
return 0, 0, xerrors.Errorf("failed to fetch container memory: %w", err)
}

// A container might not have a memory limit set. If this
// happens we want to fallback to querying the host's memory
// to know what the total memory is on the host.
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)
Copy link
Member

Choose a reason for hiding this comment

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

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)

}

mem.Total = hostMem.Total
}
} else {
mem, err = f.HostMemory(clistat.PrefixDefault)
if err != nil {
return 0, 0, xerrors.Errorf("failed to fetch memory: %w", err)
return 0, 0, xerrors.Errorf("failed to host fetch memory: %w", err)
Copy link
Member

Choose a reason for hiding this comment

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

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)

}
}

Expand Down
Loading