Do not auto expire events

matrix-org · Feb 16, 2021 · 2de6060 · 2de6060
1 parent 873da38
commit 2de6060
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/synapse/replication/tcp/external_cache.py b/synapse/replication/tcp/external_cache.py
@@ -78,7 +78,7 @@ async def delete(self, cache_name: str, key: str) -> None:
             self._redis_connection.delete(self._get_redis_key(cache_name, key),)
         )
 
-    async def set(self, cache_name: str, key: str, value: Any, expiry_ms: int) -> None:
+    async def set(self, cache_name: str, key: str, value: Any, expiry_ms: Optional[int] = None) -> None:
         """Add the key/value to the named cache, with the expiry time given.
         """
 

diff --git a/synapse/storage/databases/main/events_worker.py b/synapse/storage/databases/main/events_worker.py
@@ -62,7 +62,6 @@
 EVENT_QUEUE_THREADS = 3  # Max number of threads that will fetch events
 EVENT_QUEUE_ITERATIONS = 3  # No. times we block waiting for requests for events
 EVENT_QUEUE_TIMEOUT_S = 0.1  # Timeout when waiting for requests for events
-EVENT_EXPIRY_TIME = 24 * 60 * 60 * 1000
 GET_EVENT_CACHE_NAME = "getEvent"
 
 _EventCacheEntry = namedtuple("_EventCacheEntry", ("event", "redacted_event"))
@@ -877,7 +876,6 @@ async def _get_events_from_db(self, event_ids, allow_rejected=False):
                     GET_EVENT_CACHE_NAME,
                     event_id,
                     redis_cache_entry,
-                    expiry_ms=EVENT_EXPIRY_TIME,
                 )
 
         return result_map