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

kubelet stats should ignore .mount cgroups associated with container on systemd

Browse Source
This commit is contained in:
derekwaynecarr 2016-03-07 13:33:40 -05:00
parent a914bbd0b8
commit 26dbbdb244
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ package stats
import ( import (
"fmt" "fmt"
"runtime" "runtime"
"strings"
"time" "time"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
@ -184,7 +185,13 @@ func (sb *summaryBuilder) latestContainerStats(info *cadvisorapiv2.ContainerInfo
func (sb *summaryBuilder) buildSummaryPods() []stats.PodStats { func (sb *summaryBuilder) buildSummaryPods() []stats.PodStats {
// Map each container to a pod and update the PodStats with container data // Map each container to a pod and update the PodStats with container data
podToStats := map[stats.PodReference]*stats.PodStats{} podToStats := map[stats.PodReference]*stats.PodStats{}
for _, cinfo := range sb.infos { for key, cinfo := range sb.infos {
// on systemd using devicemapper each mount into the container has an associated cgroup.
// we ignore them to ensure we do not get duplicate entries in our summary.
// for details on .mount units: http://man7.org/linux/man-pages/man5/systemd.mount.5.html
if strings.HasSuffix(key, ".mount") {
continue
}
// Build the Pod key if this container is managed by a Pod // Build the Pod key if this container is managed by a Pod
if !sb.isPodManagedContainer(&cinfo) { if !sb.isPodManagedContainer(&cinfo) {
continue continue