From e09b91b9d6854a060fc4532ae94c463b526801fa Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Tue, 17 Oct 2023 11:44:57 +0100 Subject: [PATCH] Revert "TEMPORARY Measure and log test cases" This reverts commit adfdd6afe120d13ec6cd9d8a1d72b6fba5d8c9f8. --- .../databases/main/event_federation.py | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py index 29fb5b7b66..afffa54985 100644 --- a/synapse/storage/databases/main/event_federation.py +++ b/synapse/storage/databases/main/event_federation.py @@ -54,7 +54,6 @@ from synapse.util.caches.descriptors import cached from synapse.util.caches.lrucache import LruCache from synapse.util.cancellation import cancellable from synapse.util.iterutils import batch_iter -from synapse.util.metrics import Measure if TYPE_CHECKING: from synapse.server import HomeServer @@ -414,22 +413,12 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas room = await self.get_room(room_id) # type: ignore[attr-defined] if room["has_auth_chain_index"]: try: - with Measure(self.hs.get_clock(), "rei:get_auth_chain_difference_chains") as m: - r = await self.db_pool.runInteraction( - "get_auth_chain_difference_chains", - self._get_auth_chain_difference_using_cover_index_txn, - room_id, - state_sets, - ) - if m.get_resource_usage().ru_utime > 4.0: - logger.info( - "REI-ACDC %.2f, ri=%r ss=%r", - m.get_resource_usage().ru_utime, - room_id, - state_sets - ) - return r - + return await self.db_pool.runInteraction( + "get_auth_chain_difference_chains", + self._get_auth_chain_difference_using_cover_index_txn, + room_id, + state_sets, + ) except _NoChainCoverIndex: # For whatever reason we don't actually have a chain cover index # for the events in question, so we fall back to the old method.