From da73470ffba607b7bf491d5f147660f39aa82745 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Thu, 7 May 2020 17:54:39 +0200
Subject: [PATCH] Don't log a warning on NotRetryingDestination

Otherwise we're going to be logging `Failed to handle device list update
for @user:example.com` every 30s for every remote we're not retrying
because of backoff.
---
 synapse/handlers/device.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index ca307b67f2..f6f7bd3a2e 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -732,7 +732,12 @@ class DeviceListUpdater(object):
         origin = get_domain_from_id(user_id)
         try:
             result = yield self.federation.query_user_devices(origin, user_id)
-        except (NotRetryingDestination, RequestSendFailed, HttpResponseException):
+        except NotRetryingDestination:
+            # Mark the remote user's device list as stale so we know we need to retry it
+            # later.
+            yield self.store.mark_remote_user_device_cache_as_stale(user_id)
+            return
+        except (RequestSendFailed, HttpResponseException):
             logger.warning("Failed to handle device list update for %s", user_id)
             # Mark the remote user's device list as stale so we know we need to retry it
             # later.