dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[inputs/diskio] Fix how major and minor identifiers of block devices are read. (#5566) 

* Fix how major and minor identifiers of block devices are read.

The current implementation assure that the major and the minor are
coded on one byte. But they are not:

```
brw-rw----  1 root disk    252, 290 Feb 25 11:36 dm-290
```

290 as minor in this example is over 1 byte.

So after wondering why all my devices iops weren't correctly stored,
I found out that several points were added for some disks. For `dm-290`
it was overriding `252:34`, instead of getting udev stats for `252:290`.

The solution is here:
https://sites.uclouvain.be/SystInfo/usr/include/sys/sysmacros.h.html

The implementation is directly taken from this, fixing my bug.

* Use unix.Major/unix.Minor instead of custom implementation

* [diskio] Force type of stat.Rdev uint64 for mipsle compatibility

For most platforms, stat.Rdev is already a uint64 so this is without any effect
for linux,mipsle, unix.Stat_t.Rdev is a uint32, but the way to compute major and minor doesn't change, casting the uint32 has no impact either
This commit is contained in:
Daniel Nelson 2019-03-22 14:03:48 -07:00 committed by GitHub
parent 417c5c1de8 205de66dd6
commit 9ba023fd67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/inputs/diskio/diskio_linux.go
View File

@ -35,8 +35,8 @@ func (s *DiskIO) diskInfo(devName string) (map[string]string, error) {
return ic.values, nil return ic.values, nil
} }
major := stat.Rdev >> 8 & 0xff major := unix.Major(uint64(stat.Rdev))
minor := stat.Rdev & 0xff minor := unix.Minor(uint64(stat.Rdev))
udevDataPath := fmt.Sprintf("%s/b%d:%d", udevPath, major, minor) udevDataPath := fmt.Sprintf("%s/b%d:%d", udevPath, major, minor)
di := map[string]string{} di := map[string]string{}