Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 11:06:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Attempt to include db threads in cpu usage stats (#3496)

Browse source 
Let's try to include time spent in the DB threads in the per-request/block cpu
usage metrics.
This commit is contained in:
Richard van der Hoff 2018-07-10 16:12:36 +01:00 • committed by GitHub
parent 55370331da
commit c3c29aa196
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
synapse/storage/_base.py
View file

@ -220,7 +220,7 @@ class SQLBaseStore(object):
self._clock.looping_call(loop, 10000)
def _new_transaction(self, conn, desc, after_callbacks, exception_callbacks,
logging_context, func, *args, **kwargs):
func, *args, **kwargs):
start = time.time()
txn_id = self._TXN_ID
@ -284,8 +284,7 @@ class SQLBaseStore(object):
end = time.time()
duration = end - start
if logging_context is not None:
logging_context.add_database_transaction(duration)
LoggingContext.current_context().add_database_transaction(duration)
transaction_logger.debug("[TXN END] {%s} %f sec", name, duration)
@ -309,19 +308,15 @@ class SQLBaseStore(object):
Returns:
Deferred: The result of func
"""
current_context = LoggingContext.current_context()
after_callbacks = []
exception_callbacks = []
def inner_func(conn, *args, **kwargs):
return self._new_transaction(
conn, desc, after_callbacks, exception_callbacks, current_context,
func, *args, **kwargs
)
try:
result = yield self.runWithConnection(inner_func, *args, **kwargs)
result = yield self.runWithConnection(
self._new_transaction,
desc, after_callbacks, exception_callbacks, func,
*args, **kwargs
)
for after_callback, after_args, after_kwargs in after_callbacks:
after_callback(*after_args, **after_kwargs)
@ -346,22 +341,25 @@ class SQLBaseStore(object):
Returns:
Deferred: The result of func
"""
current_context = LoggingContext.current_context()
parent_context = LoggingContext.current_context()
if parent_context == LoggingContext.sentinel:
logger.warn(
"Running db txn from sentinel context: metrics will be lost",
)
parent_context = None
start_time = time.time()
def inner_func(conn, *args, **kwargs):
with LoggingContext("runWithConnection") as context:
with LoggingContext("runWithConnection", parent_context) as context:
sched_duration_sec = time.time() - start_time
sql_scheduling_timer.observe(sched_duration_sec)
current_context.add_database_scheduled(sched_duration_sec)
context.add_database_scheduled(sched_duration_sec)
if self.database_engine.is_connection_closed(conn):
logger.debug("Reconnecting closed database connection")
conn.reconnect()
current_context.copy_to(context)
return func(conn, *args, **kwargs)
with PreserveLoggingContext():