From 0d9b864b4b8f76b8e7f1768000b187f72ebf0f88 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Thu, 19 Aug 2021 14:29:27 -0400
Subject: [PATCH 1/2] Do not include stack traces for known exceptions.

---
 synapse/federation/federation_client.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 29979414e3d7..44d9e8a5c734 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -43,6 +43,7 @@
     Codes,
     FederationDeniedError,
     HttpResponseException,
+    RequestSendFailed,
     SynapseError,
     UnsupportedRoomVersionError,
 )
@@ -558,7 +559,11 @@ async def _try_destination_list(
 
             try:
                 return await callback(destination)
-            except InvalidResponseError as e:
+            except (
+                RequestSendFailed,
+                InvalidResponseError,
+                NotRetryingDestination,
+            ) as e:
                 logger.warning("Failed to %s via %s: %s", description, destination, e)
             except UnsupportedRoomVersionError:
                 raise

From 080ca705c5915ec7dc8d222c0791619e2b45d6a3 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Thu, 19 Aug 2021 14:32:11 -0400
Subject: [PATCH 2/2] Newsfragment

---
 changelog.d/10662.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/10662.misc

diff --git a/changelog.d/10662.misc b/changelog.d/10662.misc
new file mode 100644
index 000000000000..593f9ceaad5a
--- /dev/null
+++ b/changelog.d/10662.misc
@@ -0,0 +1 @@
+Do not print out stack traces for network errors when fetching data over federation.