OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for track disk stats when running in container

This commit is contained in:
Ilya Prudnikov 2020-01-17 11:09:10 +02:00
parent fc7e5e7af6
commit 7277cdf050
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
disk/disk_linux.go
View File

@ -300,12 +300,18 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
}
}
if strings.HasPrefix(d.Device, "/dev/mapper/") {
devpath, err := filepath.EvalSymlinks(d.Device)
if err == nil {
d.Device = devpath
}
}
//The block below has 2 problems, so should be disabled:
//1. Will not work, in case we track disk info on the host from container, as /dev will be mapped into other mount point
//2. Useful info about vg name removed if we follow symlink, here the example:
// ~# ls -la /dev/mapper/dm--01--vg-root
// lrwxrwxrwx 1 root root 7 Oct 3 10:47 /dev/mapper/dm--01--vg-root -> ../dm-0
//if strings.HasPrefix(d.Device, "/dev/mapper/") {
// devpath, err := filepath.EvalSymlinks(d.Device)
// if err == nil {
// d.Device = devpath
// }
//}
// /dev/root is not the real device name
// so we get the real device name from its major/minor number