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

Merge branch 'master' into skip-subcontainer-update-v2

Browse Source
This commit is contained in:
Seth Jennings 2017-08-17 15:53:35 -05:00 committed by GitHub
commit 9a028b6cfd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
machine/info.go
View File

@ -57,7 +57,9 @@ func GetHugePagesInfo() ([]info.HugePagesInfo, error) {
var hugePagesInfo []info.HugePagesInfo var hugePagesInfo []info.HugePagesInfo
files, err := ioutil.ReadDir(hugepagesDirectory) files, err := ioutil.ReadDir(hugepagesDirectory)
if err != nil { if err != nil {
return hugePagesInfo, err // treat as non-fatal since kernels and machine can be
// configured to disable hugepage support
return hugePagesInfo, nil
} }
for _, st := range files { for _, st := range files {
nameArray := strings.Split(st.Name(), "-") nameArray := strings.Split(st.Name(), "-")