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

Fix cgroup root path detection.

Browse Source 
The current logic assumes that cpu cgroup mnt point is <basepath>/cpu.
On some systems, its <basepath>/cpu,cpuacct (CentOS 7).
This commit is contained in:
Rohit Jnagal 2014-12-22 22:37:04 +00:00
parent 21e1d8f917
commit c8eecef6d5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
validate/validate.go
View File

@ -23,6 +23,7 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
"path"
"strings" "strings"
"github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups"
@ -188,7 +189,7 @@ func validateCgroupMounts() (string, string) {
out += desc out += desc
return Unknown, out return Unknown, out
} }
mnt = strings.TrimSuffix(mnt, "/cpu") mnt = path.Dir(mnt)
if !utils.FileExists(mnt) { if !utils.FileExists(mnt) {
out := fmt.Sprintf("Cgroup mount directory %s inaccessible.\n", mnt) out := fmt.Sprintf("Cgroup mount directory %s inaccessible.\n", mnt)
out += desc out += desc