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

Don't update current_state_events for outliers

erikj/persist_event_perf
Erik Johnston 2015-06-22 17:41:42 +01:00
parent a4ad9b9556
commit be29e152d1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
synapse/handlers/federation.py
View File

@ -156,7 +156,11 @@ class FederationHandler(BaseHandler):
}] }]
seen_ids.add(e.event_id) seen_ids.add(e.event_id)
yield self._handle_new_events(origin, event_infos) yield self._handle_new_events(
origin,
event_infos,
outliers=True
)
try: try:
_, event_stream_id, max_stream_id = yield self._handle_new_event( _, event_stream_id, max_stream_id = yield self._handle_new_event(
@ -613,7 +617,7 @@ class FederationHandler(BaseHandler):
} }
}) })
yield self._handle_new_events(origin, ev_infos) yield self._handle_new_events(origin, ev_infos, outliers=True)
auth_ids = [e_id for e_id, _ in event.auth_events] auth_ids = [e_id for e_id, _ in event.auth_events]
auth_events = { auth_events = {
@ -994,8 +998,8 @@ class FederationHandler(BaseHandler):
defer.returnValue((context, event_stream_id, max_stream_id)) defer.returnValue((context, event_stream_id, max_stream_id))
@defer.inlineCallbacks @defer.inlineCallbacks
def _handle_new_events(self, origin, event_infos, backfilled=False): def _handle_new_events(self, origin, event_infos, backfilled=False,
logger.debug("_handle_new_events: %r", event_infos) outliers=False):
contexts = yield defer.gatherResults( contexts = yield defer.gatherResults(
[ [
self._prep_event( self._prep_event(
@ -1009,19 +1013,15 @@ class FederationHandler(BaseHandler):
] ]
) )
logger.debug("_handle_new_events2: %d, %d", len(event_infos), len(contexts))
yield self.store.persist_events( yield self.store.persist_events(
[ [
(ev_info["event"], context) (ev_info["event"], context)
for ev_info, context in itertools.izip(event_infos, contexts) for ev_info, context in itertools.izip(event_infos, contexts)
], ],
backfilled=backfilled, backfilled=backfilled,
is_new_state=(not backfilled), is_new_state=(not outliers and not backfilled),
) )
logger.debug("_handle_new_events3: %r", event_infos)
@defer.inlineCallbacks @defer.inlineCallbacks
def _prep_event(self, origin, event, state=None, backfilled=False, def _prep_event(self, origin, event, state=None, backfilled=False,
current_state=None, auth_events=None): current_state=None, auth_events=None):

2
synapse/storage/events.py
View File

@ -675,7 +675,7 @@ class EventsStore(SQLBaseStore):
if is_new_state: if is_new_state:
for event, _ in state_events_and_contexts: for event, _ in state_events_and_contexts:
if not context.rejected: if not context.rejected and not event.internal_metadata.is_outlier():
txn.call_after( txn.call_after(
self.get_current_state_for_key.invalidate, self.get_current_state_for_key.invalidate,
event.room_id, event.type, event.state_key event.room_id, event.type, event.state_key