From d0a69bb801eb666d60a30021ac90f7f0237a2345 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 12 Sep 2019 12:38:09 +0100 Subject: [PATCH] Remove the cap on federation retry interval. Essentially the intention here is to end up blacklisting servers which never respond to federation requests. Fixes https://github.com/matrix-org/synapse/issues/5113. --- changelog.d/6026.feature | 1 + synapse/util/retryutils.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/6026.feature diff --git a/changelog.d/6026.feature b/changelog.d/6026.feature new file mode 100644 index 000000000000..2489ff09b5fe --- /dev/null +++ b/changelog.d/6026.feature @@ -0,0 +1 @@ +Stop sending federation transactions to servers which have been down for a long time. diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py index 5b16a8161735..f7a8db7d90ae 100644 --- a/synapse/util/retryutils.py +++ b/synapse/util/retryutils.py @@ -28,8 +28,8 @@ # how much we multiply the backoff by after each subsequent fail RETRY_MULTIPLIER = 5 -# a cap on the backoff -MAX_RETRY_INTERVAL = 24 * 60 * 60 * 1000 +# a cap on the backoff. (Essentially none) +MAX_RETRY_INTERVAL = 2 ** 63 class NotRetryingDestination(Exception):