summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-04 22:02:53 +0100
committerGitHub <noreply@github.com>2019-06-04 22:02:53 +0100
commitaa530e68005d041ad037b081fe748d301a11291a (patch)
treeaf70054c8d37234d0dfb7e477927b6aec1939926
parentFix failure to fetch batches of PDUs (#5342) (diff)
downloadsynapse-aa530e68005d041ad037b081fe748d301a11291a.tar.xz
Call RetryLimiter correctly (#5340)
Fixes a regression introduced in #5335.
-rw-r--r--changelog.d/5340.bugfix2
-rw-r--r--synapse/util/retryutils.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/changelog.d/5340.bugfix b/changelog.d/5340.bugfix
new file mode 100644

index 0000000000..931ee904e1 --- /dev/null +++ b/changelog.d/5340.bugfix
@@ -0,0 +1,2 @@ +Fix a bug where we could rapidly mark a server as unreachable even though it was only down for a few minutes. + diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py
index f6dfa77d8f..1a77456498 100644 --- a/synapse/util/retryutils.py +++ b/synapse/util/retryutils.py
@@ -97,7 +97,12 @@ def get_retry_limiter(destination, clock, store, ignore_backoff=False, **kwargs) defer.returnValue( RetryDestinationLimiter( - destination, clock, store, retry_interval, backoff_on_failure, **kwargs + destination, + clock, + store, + retry_interval, + backoff_on_failure=backoff_on_failure, + **kwargs ) )