Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup some metrics for tcp repl

This commit is contained in:
Erik Johnston 2017-04-05 13:34:54 +01:00
parent a5c401bd12
commit b43d3267e2
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/metrics/metric.py
View File

@ -83,6 +83,9 @@ class CounterMetric(BaseMetric):
def render(self): def render(self):
return map_concat(self.render_item, sorted(self.counts.keys())) return map_concat(self.render_item, sorted(self.counts.keys()))
def unregister_counter(self, *values):
self.counts.pop(values, None)
class CallbackMetric(BaseMetric): class CallbackMetric(BaseMetric):
"""A metric that returns the numeric value returned by a callback whenever """A metric that returns the numeric value returned by a callback whenever

16
synapse/replication/tcp/protocol.py
View File

@ -51,6 +51,7 @@ indicate which side is sending, these are *not* included on the wire::
from twisted.internet import defer from twisted.internet import defer
from twisted.protocols.basic import LineOnlyReceiver from twisted.protocols.basic import LineOnlyReceiver
from twisted.python.failure import Failure
from commands import ( from commands import (
COMMAND_MAP, VALID_CLIENT_COMMANDS, VALID_SERVER_COMMANDS, COMMAND_MAP, VALID_CLIENT_COMMANDS, VALID_SERVER_COMMANDS,
@ -75,6 +76,9 @@ inbound_commands_counter = metrics.register_counter(
outbound_commands_counter = metrics.register_counter( outbound_commands_counter = metrics.register_counter(
"outbound_commands", labels=["command", "name", "conn_id"], "outbound_commands", labels=["command", "name", "conn_id"],
) )
connection_close_counter = metrics.register_counter(
"close_reason", labels=["reason_type"],
)
# A list of all connected protocols. This allows us to send metrics about the # A list of all connected protocols. This allows us to send metrics about the
@ -307,6 +311,10 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver):
def connectionLost(self, reason): def connectionLost(self, reason):
logger.info("[%s] Replication connection closed: %r", self.id(), reason) logger.info("[%s] Replication connection closed: %r", self.id(), reason)
if isinstance(reason, Failure):
connection_close_counter.inc(reason.type.__name__)
else:
connection_close_counter.inc(reason.__class__.__name__)
try: try:
# Remove us from list of connections to be monitored # Remove us from list of connections to be monitored
@ -326,6 +334,14 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver):
self.state = ConnectionStates.CLOSED self.state = ConnectionStates.CLOSED
self.pending_commands = [] self.pending_commands = []
for cmd in COMMAND_MAP:
outbound_commands_counter.unregister_counter(
cmd.NAME, self.name, self.conn_id
)
inbound_commands_counter.unregister_counter(
cmd.NAME, self.name, self.conn_id
)
if self.transport: if self.transport:
self.transport.unregisterProducer() self.transport.unregisterProducer()