InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: GetContainerStats: use errdefs for error-type handling

Browse Source 
Use the errdefs utilities to make sure we correctly detect the type
of error if a containerd errdefs type is returned.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-09-06 02:19:49 +02:00
parent 9760b1f300
commit eb2e296711
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
daemon/stats.go
View File

@@ -7,6 +7,7 @@ import (
"runtime"
"time"
cerrdefs "github.com/containerd/errdefs"
"github.com/containerd/log"
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/moby/v2/daemon/container"
@@ -98,8 +99,8 @@ func (daemon *Daemon) unsubscribeToContainerStats(c *container.Container, ch cha
}
// GetContainerStats collects all the stats published by a container
func (daemon *Daemon) GetContainerStats(container *container.Container) (*containertypes.StatsResponse, error) {
stats, err := daemon.stats(container)
func (daemon *Daemon) GetContainerStats(ctr *container.Container) (*containertypes.StatsResponse, error) {
stats, err := daemon.stats(ctr)
if err != nil {
goto done
}
@@ -113,22 +114,21 @@ func (daemon *Daemon) GetContainerStats(container *container.Container) (*contai
}
// We already have the network stats on Windows directly from HCS.
if !container.Config.NetworkDisabled && runtime.GOOS != "windows" {
stats.Networks, err = daemon.getNetworkStats(container)
if !ctr.Config.NetworkDisabled && runtime.GOOS != "windows" {
stats.Networks, err = daemon.getNetworkStats(ctr)
}
done:
switch err.(type) {
case nil:
return stats, nil
case errdefs.ErrConflict, errdefs.ErrNotFound:
// return empty stats containing only name and ID if not running or not found
return &containertypes.StatsResponse{
Name: container.Name,
ID: container.ID,
}, nil
default:
log.G(context.TODO()).Errorf("collecting stats for container %s: %v", container.Name, err)
if err != nil {
if cerrdefs.IsNotFound(err) || cerrdefs.IsConflict(err) {
// return empty stats containing only name and ID if not running or not found
return &containertypes.StatsResponse{
Name: ctr.Name,
ID: ctr.ID,
}, nil
}
log.G(context.TODO()).Errorf("collecting stats for container %s: %v", ctr.Name, err)
return nil, err
}
return stats, nil
}