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.
matrix-org · Sep 12, 2019 · 0388bea · 0388bea
1 parent 59975f9
commit 0388bea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/changelog.d/6025.bugfix b/changelog.d/6025.bugfix
@@ -0,0 +1 @@
+Fix bug in calculating the federation retry backoff period.
diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py
@@ -193,8 +193,9 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         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