diff options
| author | Erik Johnston <erik@matrix.org> | 2021-03-09 13:15:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 13:15:12 +0000 |
| commit | 9cd18cc5886a5f44625c1c4730f146ec189b833e (patch) | |
| tree | 64727878a2001a5f9ed045e1f66da1276fbc020c | |
| parent | Fix additional type hints. (#9543) (diff) | |
| download | synapse-9cd18cc5886a5f44625c1c4730f146ec189b833e.tar.xz | |
Retry 5xx errors in federation client (#9567)
Fixes #8915
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/9567.bugfix | 1 | ||||
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/changelog.d/9567.bugfix b/changelog.d/9567.bugfix new file mode 100644 index 0000000000..e7322c2b5e --- /dev/null +++ b/changelog.d/9567.bugfix @@ -0,0 +1 @@ +Fix bug where federation requests were not correctly retried on 5xx responses. diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index da6866addf..5f01ebd3d4 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -534,9 +534,10 @@ class MatrixFederationHttpClient: response.code, response_phrase, body ) - # Retry if the error is a 429 (Too Many Requests), - # otherwise just raise a standard HttpResponseException - if response.code == 429: + # Retry if the error is a 5xx or a 429 (Too Many + # Requests), otherwise just raise a standard + # `HttpResponseException` + if 500 <= response.code < 600 or response.code == 429: raise RequestSendFailed(exc, can_retry=True) from exc else: raise exc |