Skip to content

Commit

Permalink
Bug 1518762 - Avoid error in psutil.disk_io_counters in resourcemonit…
Browse files Browse the repository at this point in the history
…or r=ahal

Imports giampaolo/psutil@8f99f37
to fix a bug with Linux kernel 4.18+, giampaolo/psutil#1354
(to be included in a future release of psutil, version 5.5.0)

Differential Revision: https://phabricator.services.mozilla.com/D16028

UltraBlame original commit: e26eda77b71c6c02db69441236dd95fc0db5c7f2
  • Loading branch information
marco-c committed Oct 3, 2019
1 parent 59205c2 commit 8d623cf
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion third_party/python/psutil/psutil/_pslinux.py
Original file line number Diff line number Diff line change
Expand Up @@ -1054,6 +1054,8 @@ def get_partitions():





fields = line.split()
fields_len = len(fields)
if fields_len == 15:
Expand All @@ -1062,7 +1064,7 @@ def get_partitions():
reads = int(fields[2])
(reads_merged, rbytes, rtime, writes, writes_merged,
wbytes, wtime, _, busy_time, _) = map(int, fields[4:14])
elif fields_len == 14:
elif fields_len == 14 or fields_len == 18:

name = fields[2]
(reads, reads_merged, rbytes, rtime, writes, writes_merged,
Expand Down

0 comments on commit 8d623cf

Please sign in to comment.