diff options
| author | Cheng Zhang <cheng.zhang@citrix.com> | 2017-03-30 12:47:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-30 12:47:38 +0800 |
| commit | 73775d90c74140b4c5a4eae8c59eabf296486efc (patch) | |
| tree | 955f965482ba8c1940a3ef0467185b9fbef485d4 | |
| parent | 97fe8f36da5c3838bfd74cb85f9b8cc3955f4e69 (diff) | |
| parent | 7fcbf4caa0d5644ab514b28b61559bf63df8ddcb (diff) | |
| download | vyos-xe-guest-utilities-73775d90c74140b4c5a4eae8c59eabf296486efc.tar.gz vyos-xe-guest-utilities-73775d90c74140b4c5a4eae8c59eabf296486efc.zip | |
Merge pull request #31 from minli1/private/minl1/CA-247330v7.3.0
CA-247330: XSO-676 log spams of 'CollectDisk error' with Linux guest …
| -rw-r--r-- | guestmetric/guestmetric_linux.go | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/guestmetric/guestmetric_linux.go b/guestmetric/guestmetric_linux.go index b4553b2..6c656ea 100644 --- a/guestmetric/guestmetric_linux.go +++ b/guestmetric/guestmetric_linux.go @@ -201,16 +201,15 @@ func (c *Collector) CollectDisk() (GuestMetric, error) { real_dev := "" if c.Client != nil { nodename, err := readSysfs(fmt.Sprintf("/sys/block/%s/device/nodename", disk)) - if err != nil { - return nil, err - } - backend, err := c.Client.Read(fmt.Sprintf("%s/backend", nodename)) - if err != nil { - return nil, err - } - real_dev, err = c.Client.Read(fmt.Sprintf("%s/dev", backend)) - if err != nil { - return nil, err + if err == nil { + backend, err := c.Client.Read(fmt.Sprintf("%s/backend", nodename)) + if err != nil { + return nil, err + } + real_dev, err = c.Client.Read(fmt.Sprintf("%s/dev", backend)) + if err != nil { + return nil, err + } } } name := path |