From 5210565c127bef662d595157f26a063135e6a6ae Mon Sep 17 00:00:00 2001
From: Erik Johnston <erikj@element.io>
Date: Mon, 30 Sep 2024 13:00:14 +0100
Subject: [PATCH] Reduce overhead of sliding sync E2EE loops (#17771)
Mainly toning down logging and only calling
`get_membership_from_event_ids` if something has changed.
---
changelog.d/17771.misc | 1 +
synapse/api/auth/msc3861_delegated.py | 2 +-
synapse/handlers/device.py | 11 ++++++-----
3 files changed, 8 insertions(+), 6 deletions(-)
create mode 100644 changelog.d/17771.misc
diff --git a/changelog.d/17771.misc b/changelog.d/17771.misc
new file mode 100644
index 0000000000..be28223151
--- /dev/null
+++ b/changelog.d/17771.misc
@@ -0,0 +1 @@
+Reduce overhead of sliding sync E2EE loops.
diff --git a/synapse/api/auth/msc3861_delegated.py b/synapse/api/auth/msc3861_delegated.py
index 6bd845c7e3..53907c01d4 100644
--- a/synapse/api/auth/msc3861_delegated.py
+++ b/synapse/api/auth/msc3861_delegated.py
@@ -338,7 +338,7 @@ class MSC3861DelegatedAuth(BaseAuth):
logger.exception("Failed to introspect token")
raise SynapseError(503, "Unable to introspect the access token")
- logger.info(f"Introspection result: {introspection_result!r}")
+ logger.debug("Introspection result: %r", introspection_result)
# TODO: introspection verification should be more extensive, especially:
# - verify the audience
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 4f2a9f3a5b..d88660e273 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -48,6 +48,7 @@ from synapse.metrics.background_process_metrics import (
wrap_as_background_process,
)
from synapse.storage.databases.main.client_ips import DeviceLastConnectionInfo
+from synapse.storage.databases.main.roommember import EventIdMembership
from synapse.storage.databases.main.state_deltas import StateDelta
from synapse.types import (
DeviceListUpdates,
@@ -222,7 +223,6 @@ class DeviceWorkerHandler:
return changed
@trace
- @measure_func("device.get_user_ids_changed")
@cancellable
async def get_user_ids_changed(
self, user_id: str, from_token: StreamToken
@@ -290,9 +290,11 @@ class DeviceWorkerHandler:
memberships_to_fetch.add(delta.prev_event_id)
# Fetch all the memberships for the membership events
- event_id_to_memberships = await self.store.get_membership_from_event_ids(
- memberships_to_fetch
- )
+ event_id_to_memberships: Mapping[str, Optional[EventIdMembership]] = {}
+ if memberships_to_fetch:
+ event_id_to_memberships = await self.store.get_membership_from_event_ids(
+ memberships_to_fetch
+ )
joined_invited_knocked = (
Membership.JOIN,
@@ -349,7 +351,6 @@ class DeviceWorkerHandler:
return device_list_updates
- @measure_func("_generate_sync_entry_for_device_list")
async def generate_sync_entry_for_device_list(
self,
user_id: str,