OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/rav/debug_join_test' into anoa/unflake_guest_user_test

pull/7327/head
Andrew Morgan 2020-05-06 16:29:33 +01:00
parent 45db8dd170 92d9cf5457
commit 4fd0b29404
No known key found for this signature in database
GPG Key ID: 8884880D2EFE5FF4
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
changelog.d/1.misc Normal file
View File

5
synapse/state/__init__.py
View File

@ -131,10 +131,13 @@ class StateHandler(object):
if not latest_event_ids: if not latest_event_ids:
latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id) latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
logger.info("latest events in %s: %s", room_id, latest_event_ids)
logger.debug("calling resolve_state_groups from get_current_state") logger.debug("calling resolve_state_groups from get_current_state")
ret = yield self.resolve_state_groups_for_events(room_id, latest_event_ids) ret = yield self.resolve_state_groups_for_events(room_id, latest_event_ids)
state = ret.state state = ret.state
logger.info("state at %s: %s", latest_event_ids, state)
if event_type: if event_type:
event_id = state.get((event_type, state_key)) event_id = state.get((event_type, state_key))
event = None event = None
@ -380,6 +383,8 @@ class StateHandler(object):
room_id, event_ids room_id, event_ids
) )
logger.info("state groups at %s: %s", event_ids, state_groups_ids)
if len(state_groups_ids) == 0: if len(state_groups_ids) == 0:
return _StateCacheEntry(state={}, state_group=None) return _StateCacheEntry(state={}, state_group=None)
elif len(state_groups_ids) == 1: elif len(state_groups_ids) == 1:

8
synapse/storage/data_stores/main/events.py
View File

@ -647,7 +647,12 @@ class EventsStore(
self.db.simple_delete_txn( self.db.simple_delete_txn(
txn, table="event_forward_extremities", keyvalues={"room_id": room_id} txn, table="event_forward_extremities", keyvalues={"room_id": room_id}
) )
txn.call_after(self.get_latest_event_ids_in_room.invalidate, (room_id,))
def inv(*args):
logger.info("Invalidating get_latest_event_ids: %r", *args)
self.get_latest_event_ids_in_room.invalidate(*args)
txn.call_after(inv, (room_id,))
self.db.simple_insert_many_txn( self.db.simple_insert_many_txn(
txn, txn,
@ -658,6 +663,7 @@ class EventsStore(
for ev_id in new_extrem for ev_id in new_extrem
], ],
) )
logger.info("new forward extremities: %s", new_forward_extremities)
# We now insert into stream_ordering_to_exterm a mapping from room_id, # We now insert into stream_ordering_to_exterm a mapping from room_id,
# new stream_ordering to new forward extremeties in the room. # new stream_ordering to new forward extremeties in the room.
# This allows us to later efficiently look up the forward extremeties # This allows us to later efficiently look up the forward extremeties