github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Don't report FS stats for system containers

Browse Source
This commit is contained in:
Tim St. Clair 2016-10-17 16:57:17 -07:00
parent 4a13431af3
commit bd80da5822
No known key found for this signature in database
GPG Key ID: 434D16BCEF479EAB
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/server/stats/summary.go
View File

@ -146,7 +146,11 @@ func (sb *summaryBuilder) build() (*stats.Summary, error) {
} }
for sys, name := range systemContainers { for sys, name := range systemContainers {
if info, ok := sb.infos[name]; ok { if info, ok := sb.infos[name]; ok {
nodeStats.SystemContainers = append(nodeStats.SystemContainers, sb.containerInfoV2ToStats(sys, &info)) sysCont := sb.containerInfoV2ToStats(sys, &info)
// System containers don't have a filesystem associated with them.
sysCont.Rootfs = nil
sysCont.Logs = nil
nodeStats.SystemContainers = append(nodeStats.SystemContainers, sysCont)
} }
} }

4
pkg/kubelet/server/stats/summary_test.go
View File

@ -183,8 +183,8 @@ func TestBuildSummary(t *testing.T) {
assert.EqualValues(t, testTime(creationTime, seed).Unix(), sys.StartTime.Time.Unix(), name+".StartTime") assert.EqualValues(t, testTime(creationTime, seed).Unix(), sys.StartTime.Time.Unix(), name+".StartTime")
checkCPUStats(t, name, seed, sys.CPU) checkCPUStats(t, name, seed, sys.CPU)
checkMemoryStats(t, name, seed, info, sys.Memory) checkMemoryStats(t, name, seed, info, sys.Memory)
checkFsStats(t, rootfsCapacity, rootfsAvailable, totalRootfsInodes, rootfsInodesFree, sys.Logs) assert.Nil(t, sys.Logs, name+".Logs")
checkFsStats(t, imagefsCapacity, imagefsAvailable, totalImagefsInodes, imagefsInodesFree, sys.Rootfs) assert.Nil(t, sys.Rootfs, name+".Rootfs")
} }
assert.Equal(t, 3, len(summary.Pods)) assert.Equal(t, 3, len(summary.Pods))

5
test/e2e_node/summary_test.go
View File

@ -74,9 +74,8 @@ var _ = framework.KubeDescribe("Summary API", func() {
"PageFaults": bounded(1000, 1E9), "PageFaults": bounded(1000, 1E9),
"MajorPageFaults": bounded(0, 100000), "MajorPageFaults": bounded(0, 100000),
}), }),
// TODO(#31999): Don't report FS stats for system containers. "Rootfs": BeNil(),
"Rootfs": gstruct.Ignore(), "Logs": BeNil(),
"Logs": gstruct.Ignore(),
"UserDefinedMetrics": BeEmpty(), "UserDefinedMetrics": BeEmpty(),
}) })
// Expectations for pods. // Expectations for pods.