From 2f2bbb4d063501d9e07e824fb4533b62c55b93ad Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 20 Nov 2015 09:34:58 +0000
Subject: [PATCH] Use min and not max to set an upper bound on retry interval
---
synapse/http/matrixfederationclient.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 614c06a6d7..4e6572df72 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -190,11 +190,11 @@ class MatrixFederationHttpClient(object):
if retries_left and not timeout:
if long_retries:
delay = 4 ** (MAX_LONG_RETRIES + 1 - retries_left)
- delay = max(delay, 60)
+ delay = min(delay, 60)
delay *= random.uniform(0.8, 1.4)
else:
delay = 0.5 * 2 ** (MAX_SHORT_RETRIES - retries_left)
- delay = max(delay, 2)
+ delay = min(delay, 2)
delay *= random.uniform(0.8, 1.4)
yield sleep(delay)
--
GitLab