diff options
| author | Mathieu Velten <mathieuv@matrix.org> | 2023-08-16 16:19:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-16 16:19:54 +0200 |
| commit | 8c3bcea2da4939e21a99f72d6c3995186bc4b80d (patch) | |
| tree | eee47996c192118ab4f0b3af9b50de3d095fb65b /synapse/handlers/room_member.py | |
| parent | Add link explaining ELK stack to structured_logging.md (#16091) (diff) | |
| download | synapse-8c3bcea2da4939e21a99f72d6c3995186bc4b80d.tar.xz | |
Rename pagination&purge locks and add comments explaining them (#16112)
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index e3cdf2bc61..1d8d4a72e7 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -39,7 +39,7 @@ from synapse.events import EventBase from synapse.events.snapshot import EventContext from synapse.handlers.profile import MAX_AVATAR_URL_LEN, MAX_DISPLAYNAME_LEN from synapse.handlers.state_deltas import MatchChange, StateDeltasHandler -from synapse.handlers.worker_lock import DELETE_ROOM_LOCK_NAME +from synapse.handlers.worker_lock import NEW_EVENT_DURING_PURGE_LOCK_NAME from synapse.logging import opentracing from synapse.metrics import event_processing_positions from synapse.metrics.background_process_metrics import run_as_background_process @@ -621,7 +621,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta): async with self.member_as_limiter.queue(as_id): async with self.member_linearizer.queue(key): async with self._worker_lock_handler.acquire_read_write_lock( - DELETE_ROOM_LOCK_NAME, room_id, write=False + NEW_EVENT_DURING_PURGE_LOCK_NAME, room_id, write=False ): with opentracing.start_active_span("update_membership_locked"): result = await self.update_membership_locked( |