Skip to content

Fix psutil dio counters none #6093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrocklin merged 4 commits into from
Apr 19, 2022
Merged

Fix psutil dio counters none #6093

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83fda6b
be more fault tolerant if psutil.disk_io_counters returns None
ungarj Apr 6, 2022
4286653
be more fault tolerant if psutil.disk_io_counters returns None
ungarj Apr 6, 2022
2092bb6
Merge branch 'fix_psutil_dio_counters_none' of github.com:ungarj/dist…
ungarj Apr 8, 2022
0190f6b
reformatted by pre-commit run
ungarj Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions distributed/system_monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,23 @@ def update(self):
except Exception:
pass
else:
last_disk = self._last_disk_io_counters
duration_disk = now - self.last_time_disk
read_bytes_disk = (disk_ioc.read_bytes - last_disk.read_bytes) / (
duration_disk or 0.5
)
write_bytes_disk = (disk_ioc.write_bytes - last_disk.write_bytes) / (
duration_disk or 0.5
)
self.last_time_disk = now
self._last_disk_io_counters = disk_ioc
self.read_bytes_disk.append(read_bytes_disk)
self.write_bytes_disk.append(write_bytes_disk)
result["read_bytes_disk"] = read_bytes_disk
result["write_bytes_disk"] = write_bytes_disk
if disk_ioc is None: # diskless machine
self._collect_disk_io_counters = False
else:
last_disk = self._last_disk_io_counters
duration_disk = now - self.last_time_disk
read_bytes_disk = (disk_ioc.read_bytes - last_disk.read_bytes) / (
duration_disk or 0.5
)
write_bytes_disk = (
disk_ioc.write_bytes - last_disk.write_bytes
) / (duration_disk or 0.5)
self.last_time_disk = now
self._last_disk_io_counters = disk_ioc
self.read_bytes_disk.append(read_bytes_disk)
self.write_bytes_disk.append(write_bytes_disk)
result["read_bytes_disk"] = read_bytes_disk
result["write_bytes_disk"] = write_bytes_disk

if not WINDOWS:
num_fds = self.proc.num_fds()
Expand Down