Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 13:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1861560 - ignore errors when SystemResourceMonitor receives partial incorrect data, r=releng-reviewers,jcristau.

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D192057
This commit is contained in:
Florian Quèze 2023-10-27 12:23:01 +00:00
parent 42f3b82240
commit e0b6c75e62
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
View File

@ -377,8 +377,9 @@ class SystemResourceMonitor(object):
virt_mem,
swap_mem,
) = self._pipe.recv()
except Exception:
# Let's assume we're done here
except Exception as e:
warnings.warn("failed to receive data: %s" % e)
# Assume we can't recover
break
# There should be nothing after the "done" message so
@ -386,16 +387,35 @@ class SystemResourceMonitor(object):
if start_time == "done":
break
io = self._io_type(*io_diff)
virt = self._virt_type(*virt_mem)
swap = self._swap_type(*swap_mem)
cpu_times = [self._cpu_times_type(*v) for v in cpu_diff]
try:
io = self._io_type(*io_diff)
virt = self._virt_type(*virt_mem)
swap = self._swap_type(*swap_mem)
cpu_times = [self._cpu_times_type(*v) for v in cpu_diff]
self.measurements.append(
SystemResourceUsage(
start_time, end_time, cpu_times, cpu_percent, io, virt, swap
self.measurements.append(
SystemResourceUsage(
start_time, end_time, cpu_times, cpu_percent, io, virt, swap
)
)
)
except Exception:
# We also can't recover, but output the data that caused the exception
warnings.warn(
"failed to read the received data: %s"
% str(
(
start_time,
end_time,
io_diff,
cpu_diff,
cpu_percent,
virt_mem,
swap_mem,
)
)
)
break
# We establish a timeout so we don't hang forever if the child
# process has crashed.