From 3930a96763be797d9f96328843cbe7a18064f7b7 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 22 Apr 2020 23:00:33 +0100 Subject: [PATCH] more testing for flaky test --- synapse/state/__init__.py | 1 + synapse/storage/data_stores/main/events.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index 4afefc6b1d..61fb379f01 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -131,6 +131,7 @@ class StateHandler(object): if not latest_event_ids: 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") ret = yield self.resolve_state_groups_for_events(room_id, latest_event_ids) state = ret.state diff --git a/synapse/storage/data_stores/main/events.py b/synapse/storage/data_stores/main/events.py index e71c23541d..a3ad22a56c 100644 --- a/synapse/storage/data_stores/main/events.py +++ b/synapse/storage/data_stores/main/events.py @@ -647,7 +647,12 @@ class EventsStore( self.db.simple_delete_txn( 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( txn, @@ -658,6 +663,7 @@ class EventsStore( 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, # new stream_ordering to new forward extremeties in the room. # This allows us to later efficiently look up the forward extremeties