Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-03 05:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pending_calls metric to not lie

Browse source
This commit is contained in:
Erik Johnston 2015-08-14 15:42:52 +01:00
parent 3d1cdda762
commit 891dfd90bd
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
synapse/metrics/__init__.py
View file

@ -158,18 +158,33 @@ def runUntilCurrentTimer(func):
@functools.wraps(func)
def f(*args, **kwargs):
pending_calls = len(reactor.getDelayedCalls())
now = reactor.seconds()
num_pending = 0
# _newTimedCalls is one long list of *all* pending calls. Below loop
# is based off of impl of reactor.runUntilCurrent
for p in reactor._newTimedCalls:
if p.time > now:
break
if p.delayed_time > 0:
continue
num_pending += 1
num_pending += len(reactor.threadCallQueue)
start = time.time() * 1000
ret = func(*args, **kwargs)
end = time.time() * 1000
tick_time.inc_by(end - start)
pending_calls_metric.inc_by(pending_calls)
pending_calls_metric.inc_by(num_pending)
return ret
return f
if hasattr(reactor, "runUntilCurrent"):
if hasattr(reactor, "runUntilCurrent") and hasattr(reactor, "_newTimedCalls"):
# runUntilCurrent is called when we have pending calls. It is called once
# per iteratation after fd polling.
reactor.runUntilCurrent = runUntilCurrentTimer(reactor.runUntilCurrent)