github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix container stats.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2017-09-28 05:49:32 +00:00
parent e723a5018b
commit de6287d626
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/container_stats_list.go
View File

@ -78,8 +78,8 @@ func (c *criContainerdService) getContainerMetrics(
// If snapshotstore doesn't have cached snapshot information // If snapshotstore doesn't have cached snapshot information
// set WritableLayer usage to zero // set WritableLayer usage to zero
if err == nil { if err == nil {
inodesUsed = sn.Size usedBytes = sn.Size
usedBytes = sn.Inodes inodesUsed = sn.Inodes
} }
cs.WritableLayer = &runtime.FilesystemUsage{ cs.WritableLayer = &runtime.FilesystemUsage{
Timestamp: sn.Timestamp, Timestamp: sn.Timestamp,

25
pkg/server/instrumented_service.go
View File

@ -280,6 +280,7 @@ func (in *instrumentedService) RemoveImage(ctx context.Context, r *runtime.Remov
}() }()
return in.criContainerdService.RemoveImage(ctx, r) return in.criContainerdService.RemoveImage(ctx, r)
} }
func (in *instrumentedService) ImageFsInfo(ctx context.Context, r *runtime.ImageFsInfoRequest) (res *runtime.ImageFsInfoResponse, err error) { func (in *instrumentedService) ImageFsInfo(ctx context.Context, r *runtime.ImageFsInfoRequest) (res *runtime.ImageFsInfoResponse, err error) {
glog.V(4).Infof("ImageFsInfo") glog.V(4).Infof("ImageFsInfo")
defer func() { defer func() {
@ -291,3 +292,27 @@ func (in *instrumentedService) ImageFsInfo(ctx context.Context, r *runtime.Image
}() }()
return in.criContainerdService.ImageFsInfo(ctx, r) return in.criContainerdService.ImageFsInfo(ctx, r)
} }
func (in *instrumentedService) ContainerStats(ctx context.Context, r *runtime.ContainerStatsRequest) (res *runtime.ContainerStatsResponse, err error) {
glog.V(4).Infof("ContainerStats for %q", r.GetContainerId())
defer func() {
if err != nil {
glog.Errorf("ContainerStats for %q failed, error: %v", r.GetContainerId(), err)
} else {
glog.V(4).Infof("ContainerStats for %q returns stats %+v", r.GetContainerId(), res.GetStats())
}
}()
return in.criContainerdService.ContainerStats(ctx, r)
}
func (in *instrumentedService) ListContainerStats(ctx context.Context, r *runtime.ListContainerStatsRequest) (res *runtime.ListContainerStatsResponse, err error) {
glog.V(5).Infof("ListContainerStats with filter %+v", r.GetFilter())
defer func() {
if err != nil {
glog.Errorf("ListContainerStats failed, error: %v", err)
} else {
glog.V(5).Infof("ListContainerStats returns stats %+v", res.GetStats())
}
}()
return in.criContainerdService.ListContainerStats(ctx, r)
}