jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #75 from vmarmol/fix-stats 

Ignore stats that are not available
This commit is contained in:
Rohit Jnagal 2014-07-08 14:31:16 -07:00
parent 12c465c1d2 b18a4fdf2e
commit 8e3130d7fd
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cgroups/fs/blkio.go
View File

@ -7,6 +7,7 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
"syscall"
"github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups"
) )
@ -65,6 +66,9 @@ func getBlkioStat(path string) ([]cgroups.BlkioStatEntry, error) {
var blkioStats []cgroups.BlkioStatEntry var blkioStats []cgroups.BlkioStatEntry
f, err := os.Open(path) f, err := os.Open(path)
if err != nil { if err != nil {
if pathErr, ok := err.(*os.PathError); ok && pathErr.Err == syscall.ENOENT {
return blkioStats, nil
}
return nil, err return nil, err
} }
defer f.Close() defer f.Close()

16
cgroups/fs/blkio_test.go
View File

@ -86,8 +86,8 @@ func TestBlkioStatsNoSectorsFile(t *testing.T) {
blkio := &blkioGroup{} blkio := &blkioGroup{}
err := blkio.GetStats(helper.CgroupData, &actualStats) err := blkio.GetStats(helper.CgroupData, &actualStats)
if err == nil { if err != nil {
t.Fatal("Expected to fail, but did not") t.Fatalf("Failed unexpectedly: %s", err)
} }
} }
@ -102,8 +102,8 @@ func TestBlkioStatsNoServiceBytesFile(t *testing.T) {
blkio := &blkioGroup{} blkio := &blkioGroup{}
err := blkio.GetStats(helper.CgroupData, &actualStats) err := blkio.GetStats(helper.CgroupData, &actualStats)
if err == nil { if err != nil {
t.Fatal("Expected to fail, but did not") t.Fatalf("Failed unexpectedly: %s", err)
} }
} }
@ -118,8 +118,8 @@ func TestBlkioStatsNoServicedFile(t *testing.T) {
blkio := &blkioGroup{} blkio := &blkioGroup{}
err := blkio.GetStats(helper.CgroupData, &actualStats) err := blkio.GetStats(helper.CgroupData, &actualStats)
if err == nil { if err != nil {
t.Fatal("Expected to fail, but did not") t.Fatalf("Failed unexpectedly: %s", err)
} }
} }
@ -134,8 +134,8 @@ func TestBlkioStatsNoQueuedFile(t *testing.T) {
blkio := &blkioGroup{} blkio := &blkioGroup{}
err := blkio.GetStats(helper.CgroupData, &actualStats) err := blkio.GetStats(helper.CgroupData, &actualStats)
if err == nil { if err != nil {
t.Fatal("Expected to fail, but did not") t.Fatalf("Failed unexpectedly: %s", err)
} }
} }

4
cgroups/fs/memory.go
View File

@ -5,6 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
"syscall"
"github.com/docker/libcontainer/cgroups" "github.com/docker/libcontainer/cgroups"
) )
@ -60,6 +61,9 @@ func (s *memoryGroup) GetStats(d *data, stats *cgroups.Stats) error {
// Set stats from memory.stat. // Set stats from memory.stat.
statsFile, err := os.Open(filepath.Join(path, "memory.stat")) statsFile, err := os.Open(filepath.Join(path, "memory.stat"))
if err != nil { if err != nil {
if pathErr, ok := err.(*os.PathError); ok && pathErr.Err == syscall.ENOENT {
return nil
}
return err return err
} }
defer statsFile.Close() defer statsFile.Close()

4
cgroups/fs/memory_test.go
View File

@ -43,8 +43,8 @@ func TestMemoryStatsNoStatFile(t *testing.T) {
memory := &memoryGroup{} memory := &memoryGroup{}
err := memory.GetStats(helper.CgroupData, &actualStats) err := memory.GetStats(helper.CgroupData, &actualStats)
if err == nil { if err != nil {
t.Fatal("Expected failure") t.Fatal(err)
} }
} }