Slightly more aggressive retry timers at HTTP level

erikjohnston · erikjohnston · commit bceec6591311 · 2015-11-17T15:10:05.000Z
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
@@ -56,7 +56,7 @@
 )
 
 
-MAX_RETRIES = 4
+MAX_RETRIES = 10
 
 
 class MatrixFederationEndpointFactory(object):
@@ -184,7 +184,8 @@ def send_request():
                     )
 
                     if retries_left and not timeout:
-                        delay = 5 ** (MAX_RETRIES + 1 - retries_left)
+                        delay = 4 ** (MAX_RETRIES + 1 - retries_left)
+                        delay = max(delay, 60)
                         delay *= random.uniform(0.8, 1.4)
                         yield sleep(delay)
                         retries_left -= 1

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`)`
`57`	`57`
`58`	`58`
`59`		`-MAX_RETRIES = 4`
	`59`	`+MAX_RETRIES = 10`
`60`	`60`
`61`	`61`
`62`	`62`	`class MatrixFederationEndpointFactory(object):`
`@@ -184,7 +184,8 @@ def send_request():`
`184`	`184`	`)`
`185`	`185`
`186`	`186`	`if retries_left and not timeout:`
`187`		`- delay = 5 ** (MAX_RETRIES + 1 - retries_left)`
	`187`	`+ delay = 4 ** (MAX_RETRIES + 1 - retries_left)`
	`188`	`+ delay = max(delay, 60)`
`188`	`189`	`delay *= random.uniform(0.8, 1.4)`
`189`	`190`	`yield sleep(delay)`
`190`	`191`	`retries_left -= 1`