Merge pull request #5042 from matrix-org/erikj/fix_get_missing_events_error

Handle the case of `get_missing_events` failing

changelog.d/5042.bugfix

@@ -0,0 +1 @@
+Fix bug processing incoming events over federation if call to `/get_missing_events` fails.

synapse/handlers/federation.py

@@ -498,6 +498,7 @@ class FederationHandler(BaseHandler):
         #
         # All that said: Let's try increasing the timout to 60s and see what happens.
 
+        try:
             missing_events = yield self.federation_client.get_missing_events(
                 origin,
                 room_id,
@@ -507,6 +508,15 @@ class FederationHandler(BaseHandler):
                 min_depth=min_depth,
                 timeout=60000,
             )
+        except RequestSendFailed as e:
+            # We failed to get the missing events, but since we need to handle
+            # the case of `get_missing_events` not returning the necessary
+            # events anyway, it is safe to simply log the error and continue.
+            logger.warn(
+                "[%s %s]: Failed to get prev_events: %s",
+                room_id, event_id, e,
+            )
+            return
 
         logger.info(
             "[%s %s]: Got %d prev_events: %s",