kubelet/stats: fix pid stats for cadvisor stats provider

haircommander · haircommander · commit 5fd7219cf494 · 2024-07-22T10:54:42.000-04:00
the process stats aren't correct coming from only the pod stats.
They need to be summed for all of the containers, as cadvisor
is only reading per pid (per container process)

Signed-off-by: Peter Hunt &lt;pehunt@redhat.com&gt;
diff --git a/pkg/kubelet/stats/cadvisor_stats_provider.go b/pkg/kubelet/stats/cadvisor_stats_provider.go
@@ -139,6 +139,8 @@ func (p *cadvisorStatsProvider) ListPodStats(_ context.Context) ([]statsapi.PodS
 			}
 			podStats.Containers = append(podStats.Containers, *containerStat)
 		}
+		// Either way, collect process stats
+		podStats.ProcessStats = mergeProcessStats(podStats.ProcessStats, cadvisorInfoToProcessStats(&cinfo))
 	}
 
 	// Add each PodStats to the result.
@@ -154,7 +156,7 @@ func (p *cadvisorStatsProvider) ListPodStats(_ context.Context) ([]statsapi.PodS
 			podStats.CPU = cpu
 			podStats.Memory = memory
 			podStats.Swap = cadvisorInfoToSwapStats(podInfo)
-			podStats.ProcessStats = cadvisorInfoToProcessStats(podInfo)
+			// ProcessStats were accumulated as the containers were iterated.
 		}
 
 		status, found := p.statusProvider.GetPodStatus(podUID)

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ func (p *cadvisorStatsProvider) ListPodStats(_ context.Context) ([]statsapi.PodS`
`139`	`139`	`}`
`140`	`140`	`podStats.Containers = append(podStats.Containers, *containerStat)`
`141`	`141`	`}`
	`142`	`+ // Either way, collect process stats`
	`143`	`+ podStats.ProcessStats = mergeProcessStats(podStats.ProcessStats, cadvisorInfoToProcessStats(&cinfo))`
`142`	`144`	`}`
`143`	`145`
`144`	`146`	`// Add each PodStats to the result.`
`@@ -154,7 +156,7 @@ func (p *cadvisorStatsProvider) ListPodStats(_ context.Context) ([]statsapi.PodS`
`154`	`156`	`podStats.CPU = cpu`
`155`	`157`	`podStats.Memory = memory`
`156`	`158`	`podStats.Swap = cadvisorInfoToSwapStats(podInfo)`
`157`		`- podStats.ProcessStats = cadvisorInfoToProcessStats(podInfo)`
	`159`	`+ // ProcessStats were accumulated as the containers were iterated.`
`158`	`160`	`}`
`159`	`161`
`160`	`162`	`status, found := p.statusProvider.GetPodStatus(podUID)`