Partial state resync: catch NotRetryingDestination

David Robertson · David Robertson · commit d05d53db5007 · 2022-10-10T16:09:01.000+01:00
This means that

- if we decline to retry, we'll move on to try another HS
- if there are no other servers left to retry, we'll have slightly
  better logging
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
@@ -1708,7 +1708,7 @@ async def _sync_partial_state_room(
                             destination, event
                         )
                         break
-                    except FederationError as e:
+                    except (NotRetryingDestination, FederationError) as e:
                         if attempt == len(destinations) - 1:
                             # We have tried every remote server for this event. Give up.
                             # TODO(faster_joins) giving up isn't the right thing to do

Original file line number	Diff line number	Diff line change
`@@ -1708,7 +1708,7 @@ async def _sync_partial_state_room(`
`1708`	`1708`	`destination, event`
`1709`	`1709`	`)`
`1710`	`1710`	`break`
`1711`		`- except FederationError as e:`
	`1711`	`+ except (NotRetryingDestination, FederationError) as e:`
`1712`	`1712`	`if attempt == len(destinations) - 1:`
`1713`	`1713`	`# We have tried every remote server for this event. Give up.`
`1714`	`1714`	`# TODO(faster_joins) giving up isn't the right thing to do`