From 463d6e6ac496572a886442f7dea0951019a64611 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 23 Feb 2024 13:34:44 +0000 Subject: [PATCH] Fix bug in hunt for missing state --- synapse/handlers/sync.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 37a9ef0edb4..8eeab7948af 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -1534,7 +1534,7 @@ async def _log_client_state_desync( ) if state_error: client_state_desync_logger.warning( - "client state discrepancy in room %s: %s", + "client state discrepancy in incremental sync in room %s: %s", room_id, state_error, ) @@ -1572,7 +1572,7 @@ async def event_id_to_membership(event_id: Optional[str]) -> Optional[str]: if event_type != EventTypes.Member: continue - if state_key not in client_calculated_state: + if (event_type, state_key) not in client_calculated_state: error_map[state_key] = ClientCalculatedMembershipStateErrorEntry( actual=await event_id_to_membership(actual_event_id), calculated=None,