Fix bug in calculating the federation retry backoff period (#6025)

This was intended to introduce an element of jitter; instead it gave you a
30/60 chance of resetting to zero.
joriks/3pid_config_args
Richard van der Hoff 2019-09-12 12:59:43 +01:00 committed by GitHub
parent 59975f9a63
commit 0388beafe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

1
changelog.d/6025.bugfix Normal file
View File

@ -0,0 +1 @@
Fix bug in calculating the federation retry backoff period.

View File

@ -193,8 +193,9 @@ class RetryDestinationLimiter(object):
else:
# We couldn't connect.
if self.retry_interval:
self.retry_interval *= RETRY_MULTIPLIER
self.retry_interval *= int(random.uniform(0.8, 1.4))
self.retry_interval = int(
self.retry_interval * RETRY_MULTIPLIER * random.uniform(0.8, 1.4)
)
if self.retry_interval >= MAX_RETRY_INTERVAL:
self.retry_interval = MAX_RETRY_INTERVAL