From 775aca578beb294c8b39d95cd9c7322b1a2aac29 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Sat, 27 Feb 2016 16:23:59 -0600 Subject: [PATCH] avoid stray timeout message --- fs/fs.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/fs.go b/fs/fs.go index de68d8f8..d6e9e27a 100644 --- a/fs/fs.go +++ b/fs/fs.go @@ -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()) 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) } stdout := string(stdoutb) if souterr != nil { 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) if err != nil { return 0, fmt.Errorf("cannot parse 'du' output %s - %s", stdout, err)