Port group attestation renewal slow down from matrix-org-hotfixes (ma…

…trix-org#7442)
phil-flex · Jun 16, 2020 · 185555b · 185555b
1 parent c913268
commit 185555b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/changelog.d/7442.misc b/changelog.d/7442.misc
@@ -0,0 +1 @@
+Run group attestation renewal in series rather than parallel for performance.
diff --git a/synapse/groups/attestations.py b/synapse/groups/attestations.py
@@ -46,7 +46,6 @@
 from synapse.api.errors import HttpResponseException, RequestSendFailed, SynapseError
 from synapse.metrics.background_process_metrics import run_as_background_process
 from synapse.types import get_domain_from_id
-from synapse.util.async_helpers import yieldable_gather_results
 
 logger = logging.getLogger(__name__)
 
@@ -208,6 +207,5 @@ def _renew_attestation(group_user: Tuple[str, str]):
                     "Error renewing attestation of %r in %r", user_id, group_id
                 )
 
-        await yieldable_gather_results(
-            _renew_attestation, ((row["group_id"], row["user_id"]) for row in rows)
-        )
+        for row in rows:
+            await _renew_attestation((row["group_id"], row["user_id"]))