Improve per-block CPU and DB usage metrics (#7426)

This commit is contained in:
Patrick Cloke 2020-05-06 16:43:39 -04:00 committed by GitHub
parent 4162c39dcf
commit d7c2df2fa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 12 deletions

1
changelog.d/7426.misc Normal file
View File

@ -0,0 +1 @@
Clean up some LoggingContext code.

View File

@ -431,15 +431,7 @@ class LoggingContext(object):
return return
utime_delta, stime_delta = self._get_cputime(rusage) utime_delta, stime_delta = self._get_cputime(rusage)
self._resource_usage.ru_utime += utime_delta self.add_cputime(utime_delta, stime_delta)
self._resource_usage.ru_stime += stime_delta
# if we have a parent, pass our CPU usage stats on
if self.parent_context:
self.parent_context._resource_usage += self._resource_usage
# reset them in case we get entered again
self._resource_usage.reset()
finally: finally:
self.usage_start = None self.usage_start = None
@ -497,30 +489,52 @@ class LoggingContext(object):
return utime_delta, stime_delta return utime_delta, stime_delta
def add_cputime(self, utime_delta: float, stime_delta: float) -> None:
"""Update the CPU time usage of this context (and any parents, recursively).
Args:
utime_delta: additional user time, in seconds, spent in this context.
stime_delta: additional system time, in seconds, spent in this context.
"""
self._resource_usage.ru_utime += utime_delta
self._resource_usage.ru_stime += stime_delta
if self.parent_context:
self.parent_context.add_cputime(utime_delta, stime_delta)
def add_database_transaction(self, duration_sec: float) -> None: def add_database_transaction(self, duration_sec: float) -> None:
"""Record the use of a database transaction and the length of time it took.
Args:
duration_sec: The number of seconds the database transaction took.
"""
if duration_sec < 0: if duration_sec < 0:
raise ValueError("DB txn time can only be non-negative") raise ValueError("DB txn time can only be non-negative")
self._resource_usage.db_txn_count += 1 self._resource_usage.db_txn_count += 1
self._resource_usage.db_txn_duration_sec += duration_sec self._resource_usage.db_txn_duration_sec += duration_sec
if self.parent_context:
self.parent_context.add_database_transaction(duration_sec)
def add_database_scheduled(self, sched_sec: float) -> None: def add_database_scheduled(self, sched_sec: float) -> None:
"""Record a use of the database pool """Record a use of the database pool
Args: Args:
sched_sec (float): number of seconds it took us to get a sched_sec: number of seconds it took us to get a connection
connection
""" """
if sched_sec < 0: if sched_sec < 0:
raise ValueError("DB scheduling time can only be non-negative") raise ValueError("DB scheduling time can only be non-negative")
self._resource_usage.db_sched_duration_sec += sched_sec self._resource_usage.db_sched_duration_sec += sched_sec
if self.parent_context:
self.parent_context.add_database_scheduled(sched_sec)
def record_event_fetch(self, event_count: int) -> None: def record_event_fetch(self, event_count: int) -> None:
"""Record a number of events being fetched from the db """Record a number of events being fetched from the db
Args: Args:
event_count (int): number of events being fetched event_count: number of events being fetched
""" """
self._resource_usage.evt_db_fetch_count += event_count self._resource_usage.evt_db_fetch_count += event_count
if self.parent_context:
self.parent_context.record_event_fetch(event_count)
class LoggingContextFilter(logging.Filter): class LoggingContextFilter(logging.Filter):