Faster room joins: avoid blocking when pulling events with missing prevs

synapse/handlers/federation_event.py

@@ -542,8 +542,24 @@ async def update_state_for_partial_state_event(
                 destination, event
             )
 
+            # There are three possible cases for (state_ids, partial_state):
+            #   * `state_ids` and `partial_state` are both `None` if we had all the
+            #     prev_events. The prev_events may or may not have partial state and
+            #     we won't know until we compute the event context.
+            #   * `state_ids` is not `None` and `partial_state` is `False` if we were
+            #     missing any prev_events. We calculated the full state after the
+            #     prev_events.
+            #   * `state_ids` is not `None` and `partial_state` is `True` if we were
+            #     missing some, but not all, prev_events. At least one of the
+            #     prev_events we did have had partial state, so we calculated a partial
+            #     state after the prev_events.
+
             context = None
-            if not partial_state:
+            if state_ids is not None and partial_state:
+                # the state after the prev events is still partial. We can't de-partial
+                # state the event, so don't bother building the event context.
+                pass
+            else:
                 # build a new state group for it if need be
                 context = await self._state_handler.compute_event_context(
                     event,
@@ -833,8 +849,15 @@ async def _process_pulled_event(
                 state_ids, partial_state = await self._resolve_state_at_missing_prevs(
                     origin, event
                 )
+
                 # We ought to have full state now, barring some unlikely race where we left and
                 # rejoned the room in the background.
+                if state_ids is not None and partial_state:
+                    raise AssertionError(
+                        f"Event {event.event_id} still has a partial resolved state "
+                        f"after room {event.room_id} was un-partial stated"
+                    )
+
                 await self._process_received_pdu(
                     origin,
                     event,