github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed: psutil, disk_io_counters() fails on Linux kernel 4.18+

hotfix/3.2.2-secure-fix
Apex Liu 2019-01-23 01:49:40 +08:00
parent f3419918cf
commit f7dedfd806
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/www/packages/packages-linux/x64/psutil/_pslinux.py
View File

@ -1060,6 +1060,8 @@ def disk_io_counters(perdisk=False):
# ...unless (Linux 2.6) the line refers to a partition instead # ...unless (Linux 2.6) the line refers to a partition instead
# of a disk, in which case the line has less fields (7): # of a disk, in which case the line has less fields (7):
# "3 1 hda1 8 8 8 8" # "3 1 hda1 8 8 8 8"
# 4.18+ has 4 fields added:
# "3 0 hda 8 8 8 8 8 8 8 8 8 8 8 0 0 0 0"
# See: # See:
# https://www.kernel.org/doc/Documentation/iostats.txt # https://www.kernel.org/doc/Documentation/iostats.txt
# https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats # https://www.kernel.org/doc/Documentation/ABI/testing/procfs-diskstats
@ -1074,7 +1076,7 @@ def disk_io_counters(perdisk=False):
reads = int(fields[2]) reads = int(fields[2])
(reads_merged, rbytes, rtime, writes, writes_merged, (reads_merged, rbytes, rtime, writes, writes_merged,
wbytes, wtime, _, busy_time, _) = map(int, fields[4:14]) wbytes, wtime, _, busy_time, _) = map(int, fields[4:14])
elif flen == 14: elif flen == 14 or flen == 18:
# Linux 2.6+, line referring to a disk # Linux 2.6+, line referring to a disk
name = fields[2] name = fields[2]
(reads, reads_merged, rbytes, rtime, writes, writes_merged, (reads, reads_merged, rbytes, rtime, writes, writes_merged,