mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Fix imagefs stats.
This commit is contained in:
parent
751bcc473c
commit
f6be138821
@ -74,46 +74,53 @@ func cadvisorInfoToContainerStats(name string, info *cadvisorapiv2.ContainerInfo
|
||||
}
|
||||
}
|
||||
|
||||
// The container logs live on the node rootfs device
|
||||
result.Logs = &statsapi.FsStats{
|
||||
Time: metav1.NewTime(cstat.Timestamp),
|
||||
AvailableBytes: &rootFs.Available,
|
||||
CapacityBytes: &rootFs.Capacity,
|
||||
InodesFree: rootFs.InodesFree,
|
||||
Inodes: rootFs.Inodes,
|
||||
if rootFs != nil {
|
||||
// The container logs live on the node rootfs device
|
||||
result.Logs = &statsapi.FsStats{
|
||||
Time: metav1.NewTime(cstat.Timestamp),
|
||||
AvailableBytes: &rootFs.Available,
|
||||
CapacityBytes: &rootFs.Capacity,
|
||||
InodesFree: rootFs.InodesFree,
|
||||
Inodes: rootFs.Inodes,
|
||||
}
|
||||
|
||||
if rootFs.Inodes != nil && rootFs.InodesFree != nil {
|
||||
logsInodesUsed := *rootFs.Inodes - *rootFs.InodesFree
|
||||
result.Logs.InodesUsed = &logsInodesUsed
|
||||
}
|
||||
}
|
||||
|
||||
if rootFs.Inodes != nil && rootFs.InodesFree != nil {
|
||||
logsInodesUsed := *rootFs.Inodes - *rootFs.InodesFree
|
||||
result.Logs.InodesUsed = &logsInodesUsed
|
||||
}
|
||||
|
||||
// The container rootFs lives on the imageFs devices (which may not be the node root fs)
|
||||
result.Rootfs = &statsapi.FsStats{
|
||||
Time: metav1.NewTime(cstat.Timestamp),
|
||||
AvailableBytes: &imageFs.Available,
|
||||
CapacityBytes: &imageFs.Capacity,
|
||||
InodesFree: imageFs.InodesFree,
|
||||
Inodes: imageFs.Inodes,
|
||||
if imageFs != nil {
|
||||
// The container rootFs lives on the imageFs devices (which may not be the node root fs)
|
||||
result.Rootfs = &statsapi.FsStats{
|
||||
Time: metav1.NewTime(cstat.Timestamp),
|
||||
AvailableBytes: &imageFs.Available,
|
||||
CapacityBytes: &imageFs.Capacity,
|
||||
InodesFree: imageFs.InodesFree,
|
||||
Inodes: imageFs.Inodes,
|
||||
}
|
||||
}
|
||||
|
||||
cfs := cstat.Filesystem
|
||||
if cfs != nil {
|
||||
if cfs.BaseUsageBytes != nil {
|
||||
rootfsUsage := *cfs.BaseUsageBytes
|
||||
result.Rootfs.UsedBytes = &rootfsUsage
|
||||
if cfs.TotalUsageBytes != nil {
|
||||
if result.Rootfs != nil {
|
||||
rootfsUsage := *cfs.BaseUsageBytes
|
||||
result.Rootfs.UsedBytes = &rootfsUsage
|
||||
}
|
||||
if cfs.TotalUsageBytes != nil && result.Logs != nil {
|
||||
logsUsage := *cfs.TotalUsageBytes - *cfs.BaseUsageBytes
|
||||
result.Logs.UsedBytes = &logsUsage
|
||||
}
|
||||
}
|
||||
if cfs.InodeUsage != nil {
|
||||
if cfs.InodeUsage != nil && result.Rootfs != nil {
|
||||
rootInodes := *cfs.InodeUsage
|
||||
result.Rootfs.InodesUsed = &rootInodes
|
||||
}
|
||||
}
|
||||
|
||||
result.UserDefinedMetrics = cadvisorInfoToUserDefinedMetrics(info)
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
|
@ -86,21 +86,15 @@ type containerStatsProvider interface {
|
||||
ImageFsStats() (*statsapi.FsStats, error)
|
||||
}
|
||||
|
||||
// GetCgroupStats returns the stats of the cgroup with the cgroupName.
|
||||
// GetCgroupStats returns the stats of the cgroup with the cgroupName. Note that
|
||||
// this function doesn't generate filesystem stats.
|
||||
func (p *StatsProvider) GetCgroupStats(cgroupName string) (*statsapi.ContainerStats, *statsapi.NetworkStats, error) {
|
||||
info, err := getCgroupInfo(p.cadvisor, cgroupName)
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("failed to get cgroup stats for %q: %v", cgroupName, err)
|
||||
}
|
||||
rootFsInfo, err := p.cadvisor.RootFsInfo()
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("failed to get rootFs info: %v", err)
|
||||
}
|
||||
imageFsInfo, err := p.cadvisor.ImagesFsInfo()
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("failed to get imageFs info: %v", err)
|
||||
}
|
||||
s := cadvisorInfoToContainerStats(cgroupName, info, &rootFsInfo, &imageFsInfo)
|
||||
// Rootfs and imagefs doesn't make sense for raw cgroup.
|
||||
s := cadvisorInfoToContainerStats(cgroupName, info, nil, nil)
|
||||
n := cadvisorInfoToNetworkStats(cgroupName, info)
|
||||
return s, n, nil
|
||||
}
|
||||
|
@ -69,9 +69,7 @@ var (
|
||||
func TestGetCgroupStats(t *testing.T) {
|
||||
const (
|
||||
cgroupName = "test-cgroup-name"
|
||||
rootFsInfoSeed = 1000
|
||||
imageFsInfoSeed = 2000
|
||||
containerInfoSeed = 3000
|
||||
containerInfoSeed = 1000
|
||||
)
|
||||
var (
|
||||
mockCadvisor = new(cadvisortest.Mock)
|
||||
@ -81,16 +79,11 @@ func TestGetCgroupStats(t *testing.T) {
|
||||
assert = assert.New(t)
|
||||
options = cadvisorapiv2.RequestOptions{IdType: cadvisorapiv2.TypeName, Count: 2, Recursive: false}
|
||||
|
||||
rootFsInfo = getTestFsInfo(rootFsInfoSeed)
|
||||
imageFsInfo = getTestFsInfo(imageFsInfoSeed)
|
||||
containerInfo = getTestContainerInfo(containerInfoSeed, "test-pod", "test-ns", "test-container")
|
||||
containerInfoMap = map[string]cadvisorapiv2.ContainerInfo{cgroupName: containerInfo}
|
||||
)
|
||||
|
||||
mockCadvisor.
|
||||
On("RootFsInfo").Return(rootFsInfo, nil).
|
||||
On("ImagesFsInfo").Return(imageFsInfo, nil).
|
||||
On("ContainerInfoV2", cgroupName, options).Return(containerInfoMap, nil)
|
||||
mockCadvisor.On("ContainerInfoV2", cgroupName, options).Return(containerInfoMap, nil)
|
||||
|
||||
provider := newStatsProvider(mockCadvisor, mockPodManager, mockRuntimeCache, fakeContainerStatsProvider{})
|
||||
cs, ns, err := provider.GetCgroupStats(cgroupName)
|
||||
@ -98,21 +91,11 @@ func TestGetCgroupStats(t *testing.T) {
|
||||
|
||||
checkCPUStats(t, "", containerInfoSeed, cs.CPU)
|
||||
checkMemoryStats(t, "", containerInfoSeed, containerInfo, cs.Memory)
|
||||
checkFsStats(t, "", imageFsInfoSeed, cs.Rootfs)
|
||||
checkFsStats(t, "", rootFsInfoSeed, cs.Logs)
|
||||
checkNetworkStats(t, "", containerInfoSeed, ns)
|
||||
|
||||
assert.Equal(cgroupName, cs.Name)
|
||||
assert.Equal(metav1.NewTime(containerInfo.Spec.CreationTime), cs.StartTime)
|
||||
|
||||
assert.Equal(metav1.NewTime(containerInfo.Stats[0].Timestamp), cs.Rootfs.Time)
|
||||
assert.Equal(*containerInfo.Stats[0].Filesystem.BaseUsageBytes, *cs.Rootfs.UsedBytes)
|
||||
assert.Equal(*containerInfo.Stats[0].Filesystem.InodeUsage, *cs.Rootfs.InodesUsed)
|
||||
|
||||
assert.Equal(metav1.NewTime(containerInfo.Stats[0].Timestamp), cs.Logs.Time)
|
||||
assert.Equal(*containerInfo.Stats[0].Filesystem.TotalUsageBytes-*containerInfo.Stats[0].Filesystem.BaseUsageBytes, *cs.Logs.UsedBytes)
|
||||
assert.Equal(*rootFsInfo.Inodes-*rootFsInfo.InodesFree, *cs.Logs.InodesUsed)
|
||||
|
||||
mockCadvisor.AssertExpectations(t)
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user