prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2588 from Creatone/creatone/perf-cgroupv2

Browse Source 
Add cgroups v2 support for perf events.
This commit is contained in:
David Ashpole 2020-06-16 09:43:26 -07:00 committed by GitHub
commit 024aa97c6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manager/manager.go
View File

@ -18,6 +18,7 @@ package manager
import ( import (
"flag" "flag"
"fmt" "fmt"
"github.com/opencontainers/runc/libcontainer/cgroups/fs2"
"net/http" "net/http"
"os" "os"
"path" "path"
@ -917,7 +918,14 @@ func (m *manager) createContainerLocked(containerName string, watchSource watche
if err != nil { if err != nil {
return err return err
} }
if !cgroups.IsCgroup2UnifiedMode() {
if cgroups.IsCgroup2UnifiedMode() {
perfCgroupPath := path.Join(fs2.UnifiedMountpoint, containerName)
cont.perfCollector, err = m.perfManager.GetCollector(perfCgroupPath)
if err != nil {
klog.Infof("perf_event metrics will not be available for container %s: %s", containerName, err)
}
} else {
devicesCgroupPath, err := handler.GetCgroupPath("devices") devicesCgroupPath, err := handler.GetCgroupPath("devices")
if err != nil { if err != nil {
klog.Warningf("Error getting devices cgroup path: %v", err) klog.Warningf("Error getting devices cgroup path: %v", err)
@ -927,14 +935,13 @@ func (m *manager) createContainerLocked(containerName string, watchSource watche
klog.V(4).Infof("GPU metrics may be unavailable/incomplete for container %s: %s", cont.info.Name, err) klog.V(4).Infof("GPU metrics may be unavailable/incomplete for container %s: %s", cont.info.Name, err)
} }
} }
perfCgroupPath, err := handler.GetCgroupPath("perf_event") perfCgroupPath, err := handler.GetCgroupPath("perf_event")
if err != nil { if err != nil {
klog.Warningf("Error getting perf_event cgroup path: %q", err) klog.Warningf("Error getting perf_event cgroup path: %q", err)
} else { } else {
cont.perfCollector, err = m.perfManager.GetCollector(perfCgroupPath) cont.perfCollector, err = m.perfManager.GetCollector(perfCgroupPath)
if err != nil { if err != nil {
klog.Infof("perf_event metrics will not be available for container %s: %s", cont.info.Name, err) klog.Infof("perf_event metrics will not be available for container %s: %s", containerName, err)
} }
} }
} }