diff options
| author | Erik Johnston <erik@matrix.org> | 2020-06-26 10:44:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 10:44:52 +0100 |
| commit | 831b31e563eb181a8bc0311a8c28519ef9f131a1 (patch) | |
| tree | 21167729aae43f44fbf7b3d4509407c222e0f9a3 | |
| parent | Move flake8 to end. Don't exit script on failure (#7738) (diff) | |
| download | synapse-831b31e563eb181a8bc0311a8c28519ef9f131a1.tar.xz | |
Add another yield point to state res v2 (#7746)
| -rw-r--r-- | changelog.d/7746.bugfix | 1 | ||||
| -rw-r--r-- | synapse/state/v2.py | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/changelog.d/7746.bugfix b/changelog.d/7746.bugfix new file mode 100644 index 0000000000..86959a5ca4 --- /dev/null +++ b/changelog.d/7746.bugfix @@ -0,0 +1 @@ +Fix large state resolutions from stalling Synapse for seconds at a time. diff --git a/synapse/state/v2.py b/synapse/state/v2.py index 7181ecda9a..bf6caa0946 100644 --- a/synapse/state/v2.py +++ b/synapse/state/v2.py @@ -126,6 +126,7 @@ def resolve_events_with_store( # Now sequentially auth each one resolved_state = yield _iterative_auth_checks( + clock, room_id, room_version, sorted_power_events, @@ -154,6 +155,7 @@ def resolve_events_with_store( logger.debug("resolving remaining events") resolved_state = yield _iterative_auth_checks( + clock, room_id, room_version, leftover_events, @@ -378,12 +380,13 @@ def _reverse_topological_power_sort( @defer.inlineCallbacks def _iterative_auth_checks( - room_id, room_version, event_ids, base_state, event_map, state_res_store + clock, room_id, room_version, event_ids, base_state, event_map, state_res_store ): """Sequentially apply auth checks to each event in given list, updating the state as it goes along. Args: + clock (Clock) room_id (str) room_version (str) event_ids (list[str]): Ordered list of events to apply auth checks to @@ -397,7 +400,7 @@ def _iterative_auth_checks( resolved_state = base_state.copy() room_version_obj = KNOWN_ROOM_VERSIONS[room_version] - for event_id in event_ids: + for idx, event_id in enumerate(event_ids, start=1): event = event_map[event_id] auth_events = {} @@ -435,6 +438,11 @@ def _iterative_auth_checks( except AuthError: pass + # We yield occasionally when we're working with large data sets to + # ensure that we don't block the reactor loop for too long. + if idx % _YIELD_AFTER_ITERATIONS == 0: + yield clock.sleep(0) + return resolved_state |