From 1944d14a4356c465830c4d33dd8372cf31e7712c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 4 Jun 2019 16:49:33 +0100
Subject: [PATCH] Fix failure to fetch batches of PDUs

FederationClient.get_pdu is called in a loop to fetch a batch of PDUs. A
failure to fetch one should not result in a failure of the whole batch. Add the
missing `continue`.
---
 changelog.d/5342.bugfix                 | 1 +
 synapse/federation/federation_client.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/5342.bugfix

diff --git a/changelog.d/5342.bugfix b/changelog.d/5342.bugfix
new file mode 100644
index 000000000000..66a3076292f6
--- /dev/null
+++ b/changelog.d/5342.bugfix
@@ -0,0 +1 @@
+Fix failure when fetching batches of events during backfill, etc.
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index f3fc897a0ac6..7a4fa36e7cbd 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -280,6 +280,7 @@ def get_pdu(self, destinations, event_id, room_version, outlier=False,
                     "Failed to get PDU %s from %s because %s",
                     event_id, destination, e,
                 )
+                continue
             except NotRetryingDestination as e:
                 logger.info(str(e))
                 continue