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

Merge pull request #1122 from vishh/du-ignore-empty

Browse Source 
Ignore empty strings paths while calculting disk usage.
This commit is contained in:
Vish Kannan 2016-02-24 13:53:20 -08:00
commit ce3c6622bb
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
container/docker/fsHandler.go
View File

@ -67,15 +67,23 @@ func newFsHandler(period time.Duration, rootfs, extraDir string, fsInfo fs.FsInf
} }
func (fh *realFsHandler) update() error { func (fh *realFsHandler) update() error {
var (
baseUsage, extraDirUsage uint64
err error
)
// TODO(vishh): Add support for external mounts. // TODO(vishh): Add support for external mounts.
baseUsage, err := fh.fsInfo.GetDirUsage(fh.rootfs, duTimeout) if fh.rootfs != "" {
if err != nil { baseUsage, err = fh.fsInfo.GetDirUsage(fh.rootfs, duTimeout)
return err if err != nil {
return err
}
} }
extraDirUsage, err := fh.fsInfo.GetDirUsage(fh.extraDir, duTimeout) if fh.extraDir != "" {
if err != nil { extraDirUsage, err = fh.fsInfo.GetDirUsage(fh.extraDir, duTimeout)
return err if err != nil {
return err
}
} }
fh.Lock() fh.Lock()

3
fs/fs.go
View File

@ -358,6 +358,9 @@ func (self *RealFsInfo) GetDirFsDevice(dir string) (*DeviceInfo, error) {
} }
func (self *RealFsInfo) GetDirUsage(dir string, timeout time.Duration) (uint64, error) { func (self *RealFsInfo) GetDirUsage(dir string, timeout time.Duration) (uint64, error) {
if dir == "" {
return 0, fmt.Errorf("invalid directory")
}
cmd := exec.Command("nice", "-n", "19", "du", "-s", dir) cmd := exec.Command("nice", "-n", "19", "du", "-s", dir)
stdoutp, err := cmd.StdoutPipe() stdoutp, err := cmd.StdoutPipe()
if err != nil { if err != nil {