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

Show file tree
Hide file tree
Changes from 4 commits
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
5 changes: 4 additions & 1 deletion agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,10 @@ func (a *agent) run() (retErr error) {
if err != nil {
return xerrors.Errorf("failed to create resources fetcher: %w", err)
}
resourcesFetcher := resourcesmonitor.NewFetcher(statfetcher)
resourcesFetcher, err := resourcesmonitor.NewFetcher(statfetcher)
if err != nil {
return xerrors.Errorf("new resource fetcher: %w", err)
}

resourcesmonitor := resourcesmonitor.NewResourcesMonitor(logger, clk, config, resourcesFetcher, aAPI)
return resourcesmonitor.Start(ctx)
Expand Down
37 changes: 31 additions & 6 deletions agent/proto/resourcesmonitor/fetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,44 @@ type Fetcher interface {

type fetcher struct {
*clistat.Statter
isContainerized bool
}

//nolint:revive
func NewFetcher(f *clistat.Statter) *fetcher {
return &fetcher{
f,
func NewFetcher(f *clistat.Statter) (*fetcher, error) {
isContainerized, err := f.IsContainerized()
if err != nil {
return nil, xerrors.Errorf("check is containerized: %w", err)
}

return &fetcher{f, isContainerized}, nil
}

func (f *fetcher) FetchMemory() (total int64, used int64, err error) {
mem, err := f.HostMemory(clistat.PrefixDefault)
if err != nil {
return 0, 0, xerrors.Errorf("failed to fetch memory: %w", err)
var mem *clistat.Result

if f.isContainerized {
mem, err = f.ContainerMemory(clistat.PrefixDefault)
if err != nil {
return 0, 0, xerrors.Errorf("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("fetch host memory: %w", err)
}

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

if mem.Total == nil {
Expand Down
4 changes: 4 additions & 0 deletions cli/clistat/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ const (
kubernetesDefaultServiceAccountToken = "/var/run/secrets/kubernetes.io/serviceaccount/token" //nolint:gosec
)

func (s *Statter) IsContainerized() (ok bool, err error) {
return IsContainerized(s.fs)
}

// IsContainerized returns whether the host is containerized.
// This is adapted from https://github.com/elastic/go-sysinfo/tree/main/providers/linux/container.go#L31
// with modifications to support Sysbox containers.
Expand Down
Loading