upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-04-29 18:29:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #137098 from yuanwang04/fix-container-swap-metrics

Browse source 
Fix container swap metrics
This commit is contained in:
Kubernetes Prow Robot 2026-02-24 12:57:36 +05:30 committed by GitHub
commit ea70974a08
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/kubelet/stats/cri_stats_provider.go
View file

@ -1195,6 +1195,11 @@ func (p *criStatsProvider) addCadvisorContainerCPUAndMemoryStats(
if memory != nil {
cs.Memory = memory
}
swap := cadvisorInfoToSwapStats(caPodStats)
if swap != nil {
cs.Swap = swap
}
}
func getCRICadvisorStats(logger klog.Logger, infos map[string]cadvisorapiv2.ContainerInfo) (map[string]cadvisorapiv2.ContainerInfo, map[string]cadvisorapiv2.ContainerInfo) {

4
pkg/kubelet/stats/cri_stats_provider_test.go
View file

@ -688,6 +688,7 @@ func TestCRIListPodCPUAndMemoryStats(t *testing.T) {
c0 := containerStatsMap[cName0]
assert.Equal(container0.CreatedAt, c0.StartTime.UnixNano())
checkCRICPUAndMemoryStats(assert, c0, infos[container0.ContainerStatus.Id].Stats[0])
checkSwapStats(t, cName0, seedContainer0, infos[container0.ContainerStatus.Id], c0.Swap)
assert.Nil(c0.Rootfs)
assert.Nil(c0.Logs)
assert.Nil(c0.Accelerators)
@ -696,6 +697,7 @@ func TestCRIListPodCPUAndMemoryStats(t *testing.T) {
c1 := containerStatsMap[cName1]
assert.Equal(container1.CreatedAt, c1.StartTime.UnixNano())
checkCRICPUAndMemoryStats(assert, c1, infos[container1.ContainerStatus.Id].Stats[0])
checkSwapStats(t, cName1, seedContainer1, infos[container1.ContainerStatus.Id], c1.Swap)
assert.Nil(c1.Rootfs)
assert.Nil(c1.Logs)
assert.Nil(c1.Accelerators)
@ -715,6 +717,7 @@ func TestCRIListPodCPUAndMemoryStats(t *testing.T) {
assert.Equal(cName2, c2.Name)
assert.Equal(container2.CreatedAt, c2.StartTime.UnixNano())
checkCRICPUAndMemoryStats(assert, c2, infos[container2.ContainerStatus.Id].Stats[0])
checkSwapStats(t, cName2, seedContainer2, infos[container2.ContainerStatus.Id], c2.Swap)
assert.Nil(c2.Rootfs)
assert.Nil(c2.Logs)
assert.Nil(c2.Accelerators)
@ -734,6 +737,7 @@ func TestCRIListPodCPUAndMemoryStats(t *testing.T) {
assert.Equal(cName3, c3.Name)
assert.Equal(container4.CreatedAt, c3.StartTime.UnixNano())
checkCRICPUAndMemoryStats(assert, c3, infos[container4.ContainerStatus.Id].Stats[0])
checkSwapStats(t, cName3, seedContainer3, infos[container4.ContainerStatus.Id], c3.Swap)
assert.Nil(c2.Rootfs)
assert.Nil(c2.Logs)
assert.Nil(c2.Accelerators)