mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-26 20:22:22 +00:00
Fix a logcontext leak in persist_events
ObserveableDeferred expects its callbacks to be called without any logcontexts, whereas it turns out we were calling them with the logcontext of the request which initiated the persistence loop. It seems wrong that we are attributing work done in the persistence loop to the request that happened to initiate it, so let's solve this by dropping the logcontext for it. (I'm not sure this actually causes any real problems other than messages in the debug log, but let's clean it up anyway)
This commit is contained in:
parent
5e16c1dc8c
commit
64ddec1bc0
@ -146,6 +146,9 @@ class _EventPeristenceQueue(object):
|
|||||||
try:
|
try:
|
||||||
queue = self._get_drainining_queue(room_id)
|
queue = self._get_drainining_queue(room_id)
|
||||||
for item in queue:
|
for item in queue:
|
||||||
|
# handle_queue_loop runs in the sentinel logcontext, so
|
||||||
|
# there is no need to preserve_fn when running the
|
||||||
|
# callbacks on the deferred.
|
||||||
try:
|
try:
|
||||||
ret = yield per_item_callback(item)
|
ret = yield per_item_callback(item)
|
||||||
item.deferred.callback(ret)
|
item.deferred.callback(ret)
|
||||||
@ -157,7 +160,11 @@ class _EventPeristenceQueue(object):
|
|||||||
self._event_persist_queues[room_id] = queue
|
self._event_persist_queues[room_id] = queue
|
||||||
self._currently_persisting_rooms.discard(room_id)
|
self._currently_persisting_rooms.discard(room_id)
|
||||||
|
|
||||||
preserve_fn(handle_queue_loop)()
|
# set handle_queue_loop off on the background. We don't want to
|
||||||
|
# attribute work done in it to the current request, so we drop the
|
||||||
|
# logcontext altogether.
|
||||||
|
with PreserveLoggingContext():
|
||||||
|
handle_queue_loop()
|
||||||
|
|
||||||
def _get_drainining_queue(self, room_id):
|
def _get_drainining_queue(self, room_id):
|
||||||
queue = self._event_persist_queues.setdefault(room_id, deque())
|
queue = self._event_persist_queues.setdefault(room_id, deque())
|
||||||
|
Loading…
Reference in New Issue
Block a user