opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-02 16:57:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpod: Factor out jail name construction from stats_freebsd.go

Browse Source 
[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2022-10-09 08:13:30 +01:00
parent b82b27cc48
commit 21081355a7
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libpod/container_internal_freebsd.go
View File

@ -279,3 +279,11 @@ func (c *Container) getConmonPidFd() int {
// keeping things simple for now. // keeping things simple for now.
return -1 return -1
} }
func (c *Container) jailName() string {
if c.state.NetNS != nil {
return c.state.NetNS.Name + "." + c.ID()
} else {
return c.ID()
}
}

8
libpod/stats_freebsd.go
View File

@ -20,13 +20,9 @@ import (
func (c *Container) getPlatformContainerStats(stats *define.ContainerStats, previousStats *define.ContainerStats) error { func (c *Container) getPlatformContainerStats(stats *define.ContainerStats, previousStats *define.ContainerStats) error {
now := uint64(time.Now().UnixNano()) now := uint64(time.Now().UnixNano())
jailName := c.ID() entries, err := rctl.GetRacct("jail:" + c.jailName())
if c.state.NetNS != nil {
jailName = c.state.NetNS.Name + "." + jailName
}
entries, err := rctl.GetRacct("jail:" + jailName)
if err != nil { if err != nil {
return fmt.Errorf("unable to read accounting for %s: %w", jailName, err) return fmt.Errorf("unable to read accounting for %s: %w", c.jailName(), err)
} }
// If the current total usage is less than what was previously // If the current total usage is less than what was previously