From d5c9dd0ef7843ee89e50366f0fad9bc2ce0d8705 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 1 May 2020 20:42:32 +0100 Subject: [PATCH 1/2] slow down group attestation renewal --- synapse/groups/attestations.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/synapse/groups/attestations.py b/synapse/groups/attestations.py index 1eec3874b600..27b0c026556c 100644 --- 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"])) From 1be2666ef05e21091aad0c5437432fc72aa6a7b1 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 6 May 2020 17:50:16 +0100 Subject: [PATCH 2/2] Add changelog --- changelog.d/7442.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7442.misc diff --git a/changelog.d/7442.misc b/changelog.d/7442.misc new file mode 100644 index 000000000000..a8fd5ad803ad --- /dev/null +++ b/changelog.d/7442.misc @@ -0,0 +1 @@ +Run group attestation renewal in series rather than parallel for performance. \ No newline at end of file