From ac646fed06d31b151a902b1f25f6a82a2d719ffd Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 26 Aug 2021 09:45:19 +0100 Subject: [PATCH] Remove some redundant patches from the hotfixes branch --- synapse/handlers/room_list.py | 1 - synapse/handlers/sync.py | 1 - synapse/storage/background_updates.py | 5 ++--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py index 8d18e07aa6..6d433fad41 100644 --- a/synapse/handlers/room_list.py +++ b/synapse/handlers/room_list.py @@ -47,7 +47,6 @@ class RoomListHandler(BaseHandler): def __init__(self, hs: "HomeServer"): super().__init__(hs) self.enable_room_list_search = hs.config.enable_room_list_search - self.response_cache: ResponseCache[ Tuple[Optional[int], Optional[str], Optional[ThirdPartyInstanceID]] ] = ResponseCache(hs.get_clock(), "room_list") diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 53ae539d74..590642f510 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -61,7 +61,6 @@ logger = logging.getLogger(__name__) # Debug logger for https://github.com/matrix-org/synapse/issues/4422 issue4422_logger = logging.getLogger("synapse.handler.sync.4422_debug") -SYNC_RESPONSE_CACHE_MS = 2 * 60 * 1000 # Counts the number of times we returned a non-empty sync. `type` is one of # "initial_sync", "full_state_sync" or "incremental_sync", `lazy_loaded` is diff --git a/synapse/storage/background_updates.py b/synapse/storage/background_updates.py index 7f975a8f16..82b31d24f1 100644 --- a/synapse/storage/background_updates.py +++ b/synapse/storage/background_updates.py @@ -84,9 +84,8 @@ class BackgroundUpdater: MINIMUM_BACKGROUND_BATCH_SIZE = 100 DEFAULT_BACKGROUND_BATCH_SIZE = 100 - # temporarily increased to make stream_ordering go faster: rv 2021/06/29 - BACKGROUND_UPDATE_INTERVAL_MS = 10 - BACKGROUND_UPDATE_DURATION_MS = 1000 + BACKGROUND_UPDATE_INTERVAL_MS = 1000 + BACKGROUND_UPDATE_DURATION_MS = 100 def __init__(self, hs: "HomeServer", database: "DatabasePool"): self._clock = hs.get_clock()