diff options
| author | Erik Johnston <erik@matrix.org> | 2021-04-08 18:05:22 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-04-08 18:05:22 +0100 |
| commit | 053c8c019fa600ceb85c7670226034ee21c43b75 (patch) | |
| tree | e81016df9807f97c1c8f88b82ad9c73cbaa94586 /synapse | |
| parent | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff) | |
| parent | Fix sharded federation sender sometimes using 100% CPU. (diff) | |
| download | synapse-053c8c019fa600ceb85c7670226034ee21c43b75.tar.xz | |
Merge branch 'erikj/fix_stalled_catchup' into matrix-org-hotfixes
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/federation/sender/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/federation/sender/__init__.py b/synapse/federation/sender/__init__.py index 98bfce22ff..d821dcbf6a 100644 --- a/synapse/federation/sender/__init__.py +++ b/synapse/federation/sender/__init__.py @@ -734,16 +734,18 @@ class FederationSender(AbstractFederationSender): self._catchup_after_startup_timer = None break + last_processed = destinations_to_wake[-1] + destinations_to_wake = [ d for d in destinations_to_wake if self._federation_shard_config.should_handle(self._instance_name, d) ] - for last_processed in destinations_to_wake: + for destination in destinations_to_wake: logger.info( "Destination %s has outstanding catch-up, waking up.", last_processed, ) - self.wake_destination(last_processed) + self.wake_destination(destination) await self.clock.sleep(CATCH_UP_STARTUP_INTERVAL_SEC) |