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

avoid stray timeout message

Browse Source
This commit is contained in:
Seth Jennings 2016-02-27 16:23:59 -06:00
parent abd7010aca
commit 775aca578b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/fs.go
View File

@ -383,14 +383,15 @@ func (self *RealFsInfo) GetDirUsage(dir string, timeout time.Duration) (uint64,
glog.Infof("killing cmd %v due to timeout(%s)", cmd.Args, timeout.String()) glog.Infof("killing cmd %v due to timeout(%s)", cmd.Args, timeout.String())
cmd.Process.Kill() cmd.Process.Kill()
}) })
if err := cmd.Wait(); err != nil { err = cmd.Wait()
timer.Stop()
if err != nil {
return 0, fmt.Errorf("du command failed on %s with output stdout: %s, stderr: %s - %v", dir, string(stdoutb), string(stderrb), err) return 0, fmt.Errorf("du command failed on %s with output stdout: %s, stderr: %s - %v", dir, string(stdoutb), string(stderrb), err)
} }
stdout := string(stdoutb) stdout := string(stdoutb)
if souterr != nil { if souterr != nil {
glog.Errorf("failed to read from stdout for cmd %v - %v", cmd.Args, souterr) glog.Errorf("failed to read from stdout for cmd %v - %v", cmd.Args, souterr)
} }
timer.Stop()
usageInKb, err := strconv.ParseUint(strings.Fields(stdout)[0], 10, 64) usageInKb, err := strconv.ParseUint(strings.Fields(stdout)[0], 10, 64)
if err != nil { if err != nil {
return 0, fmt.Errorf("cannot parse 'du' output %s - %s", stdout, err) return 0, fmt.Errorf("cannot parse 'du' output %s - %s", stdout, err)