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

De-duplicate duplicate handling

Browse source 
move the "duplicate state event" handling down into `handle_new_client_event`
where it can be shared between multiple call paths.
This commit is contained in:
Richard van der Hoff 2020-10-02 16:45:41 +01:00
parent 0991a2da93
commit b520a1bf5a
2 changed files with 32 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

41
synapse/handlers/message.py
View file

@ -674,22 +674,14 @@ class EventCreationHandler:
assert self.hs.is_mine(user), "User must be our own: %s" % (user,)
if event.is_state():
prev_event = await self.deduplicate_state_event(event, context)
if prev_event is not None:
logger.info(
"Not bothering to persist state event %s duplicated by %s",
event.event_id,
prev_event.event_id,
)
# we know it was persisted, so must have a stream ordering
assert prev_event.internal_metadata.stream_ordering
return prev_event.internal_metadata.stream_ordering
return await self.handle_new_client_event(
ev = await self.handle_new_client_event(
requester=requester, event=event, context=context, ratelimit=ratelimit
)
# we know it was persisted, so must have a stream ordering
assert ev.internal_metadata.stream_ordering
return ev.internal_metadata.stream_ordering
async def deduplicate_state_event(
self, event: EventBase, context: EventContext
) -> Optional[EventBase]:
@ -845,8 +837,10 @@ class EventCreationHandler:
context: EventContext,
ratelimit: bool = True,
extra_users: List[UserID] = [],
) -> int:
"""Processes a new event. This includes checking auth, persisting it,
) -> EventBase:
"""Processes a new event.
This includes deduplicating, checking auth, persisting,
notifying users, sending to remote servers, etc.
If called from a worker will hit out to the master process for final
@ -860,9 +854,20 @@ class EventCreationHandler:
extra_users: Any extra users to notify about event
Return:
The stream_id of the persisted event.
If the event was deduplicated, the previous, duplicate, event. Otherwise,
`event`.
"""
if event.is_state():
prev_event = await self.deduplicate_state_event(event, context)
if prev_event is not None:
logger.info(
"Not bothering to persist state event %s duplicated by %s",
event.event_id,
prev_event.event_id,
)
return prev_event
if event.is_state() and (event.type, event.state_key) == (
EventTypes.Create,
"",
@ -917,13 +922,13 @@ class EventCreationHandler:
)
stream_id = result["stream_id"]
event.internal_metadata.stream_ordering = stream_id
return stream_id
return event
stream_id = await self.persist_and_notify_client_event(
requester, event, context, ratelimit=ratelimit, extra_users=extra_users
)
return stream_id
return event
except Exception:
# Ensure that we actually remove the entries in the push actions
# staging area, if we calculated them.