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

Debug message not available on federation

pull/10419/head
Eric Eastwood 2021-06-24 19:32:18 -05:00
parent d2e2aa7bf4
commit 2d942ec0c1
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts-dev/complement.sh
View File

@ -65,4 +65,4 @@ if [[ -n "$1" ]]; then
fi fi
# Run the tests! # Run the tests!
go test -v -tags synapse_blacklist,msc2946,msc3083,msc2716 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests go test -v -tags synapse_blacklist,msc2946,msc3083,msc2716 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests -run TestBackfillingHistory/parallel/Historical_messages_are_visible_when_joining_on_federated_server

9
synapse/handlers/federation.py
View File

@ -1057,6 +1057,7 @@ class FederationHandler(BaseHandler):
self, room_id: str, current_depth: int, limit: int self, room_id: str, current_depth: int, limit: int
) -> bool: ) -> bool:
extremities = await self.store.get_oldest_events_with_depth_in_room(room_id) extremities = await self.store.get_oldest_events_with_depth_in_room(room_id)
logger.info("_maybe_backfill_inner extremities=%s", extremities)
if not extremities: if not extremities:
logger.debug("Not backfilling as no extremeties found.") logger.debug("Not backfilling as no extremeties found.")
@ -2161,8 +2162,16 @@ class FederationHandler(BaseHandler):
limit = min(limit, 100) limit = min(limit, 100)
events = await self.store.get_backfill_events(room_id, pdu_list, limit) events = await self.store.get_backfill_events(room_id, pdu_list, limit)
logger.info(
"on_backfill_request get_backfill_events events(%d)=%s", len(events), events
)
events = await filter_events_for_server(self.storage, origin, events) events = await filter_events_for_server(self.storage, origin, events)
logger.info(
"on_backfill_request filter_events_for_server events(%d)=%s",
len(events),
events,
)
return events return events

5
synapse/storage/databases/main/event_federation.py
View File

@ -663,8 +663,9 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
" ON g.event_id = e.event_id" " ON g.event_id = e.event_id"
" INNER JOIN event_backward_extremities as b" " INNER JOIN event_backward_extremities as b"
" ON g.prev_event_id = b.event_id" " ON g.prev_event_id = b.event_id"
" INNER JOIN insertion_event_extremeties as i" # TODO
" ON g.event_id = i.insertion_prev_event_id" # " INNER JOIN insertion_event_extremeties as i"
# " ON g.event_id = i.insertion_prev_event_id"
" WHERE b.room_id = ? AND g.is_state is ?" " WHERE b.room_id = ? AND g.is_state is ?"
" GROUP BY b.event_id" " GROUP BY b.event_id"
) )