### Background As part of Element's plan to support a light form of vhosting (virtual host) (multiple instances of Synapse in the same Python process), we're currently diving into the details and implications of running multiple instances of Synapse in the same Python process. "Per-tenant logging" tracked internally by https://github.com/element-hq/synapse-small-hosts/issues/48 ### Prior art Previously, we exposed `server_name` by providing a static logging `MetadataFilter` that injected the values:205d9e4fc4/synapse/config/logger.py (L216)While this can work fine for the normal case of one Synapse instance per Python process, this configures things globally and isn't compatible when we try to start multiple Synapse instances because each subsequent tenant will overwrite the previous tenant. ### What does this PR do? We remove the `MetadataFilter` and replace it by tracking the `server_name` in the `LoggingContext` and expose it with our existing [`LoggingContextFilter`](205d9e4fc4/synapse/logging/context.py (L584-L622)) that we already use to expose information about the `request`. This means that the `server_name` value follows wherever we log as expected even when we have multiple Synapse instances running in the same process. ### A note on logcontext Anywhere, Synapse mistakenly uses the `sentinel` logcontext to log something, we won't know which server sent the log. We've been fixing up `sentinel` logcontext usage as tracked by https://github.com/element-hq/synapse/issues/18905 Any further `sentinel` logcontext usage we find in the future can be fixed piecemeal as normal.d2a966f922/docs/log_contexts.md (L71-L81)### Testing strategy 1. Adjust your logging config to include `%(server_name)s` in the format ```yaml formatters: precise: format: '%(asctime)s - %(server_name)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s' ``` 1. Start Synapse: `poetry run synapse_homeserver --config-path homeserver.yaml` 1. Make some requests (`curl http://localhost:8008/_matrix/client/versions`, etc) 1. Open the homeserver logs and notice the `server_name` in the logs as expected. `unknown_server_from_sentinel_context` is expected for the `sentinel` logcontext (things outside of Synapse).
177 lines
7.0 KiB
Python
177 lines
7.0 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright 2020 Matrix.org Foundation C.I.C.
|
|
# Copyright (C) 2023 New Vector, Ltd
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as
|
|
# published by the Free Software Foundation, either version 3 of the
|
|
# License, or (at your option) any later version.
|
|
#
|
|
# See the GNU Affero General Public License for more details:
|
|
# <https://www.gnu.org/licenses/agpl-3.0.html>.
|
|
#
|
|
# Originally licensed under the Apache License, Version 2.0:
|
|
# <http://www.apache.org/licenses/LICENSE-2.0>.
|
|
#
|
|
# [This file includes modifications made by New Vector Limited]
|
|
#
|
|
#
|
|
|
|
from synapse.config._base import RootConfig
|
|
from synapse.config.cache import CacheConfig, add_resizable_cache
|
|
from synapse.types import JsonDict
|
|
from synapse.util.caches.lrucache import LruCache
|
|
|
|
from tests.unittest import TestCase
|
|
|
|
|
|
class CacheConfigTests(TestCase):
|
|
def setUp(self) -> None:
|
|
# Reset caches before each test since there's global state involved.
|
|
self.config = CacheConfig(RootConfig())
|
|
self.config.reset()
|
|
|
|
def tearDown(self) -> None:
|
|
# Also reset the caches after each test to leave state pristine.
|
|
self.config.reset()
|
|
|
|
def test_individual_caches_from_environ(self) -> None:
|
|
"""
|
|
Individual cache factors will be loaded from the environment.
|
|
"""
|
|
config: JsonDict = {}
|
|
self.config._environ = {
|
|
"SYNAPSE_CACHE_FACTOR_SOMETHING_OR_OTHER": "2",
|
|
"SYNAPSE_NOT_CACHE": "BLAH",
|
|
}
|
|
self.config.read_config(config, config_dir_path="", data_dir_path="")
|
|
self.config.resize_all_caches()
|
|
|
|
self.assertEqual(dict(self.config.cache_factors), {"something_or_other": 2.0})
|
|
|
|
def test_config_overrides_environ(self) -> None:
|
|
"""
|
|
Individual cache factors defined in the environment will take precedence
|
|
over those in the config.
|
|
"""
|
|
config: JsonDict = {"caches": {"per_cache_factors": {"foo": 2, "bar": 3}}}
|
|
self.config._environ = {
|
|
"SYNAPSE_CACHE_FACTOR_SOMETHING_OR_OTHER": "2",
|
|
"SYNAPSE_CACHE_FACTOR_FOO": "1",
|
|
}
|
|
self.config.read_config(config, config_dir_path="", data_dir_path="")
|
|
self.config.resize_all_caches()
|
|
|
|
self.assertEqual(
|
|
dict(self.config.cache_factors),
|
|
{"foo": 1.0, "bar": 3.0, "something_or_other": 2.0},
|
|
)
|
|
|
|
def test_individual_instantiated_before_config_load(self) -> None:
|
|
"""
|
|
If a cache is instantiated before the config is read, it will be given
|
|
the default cache size in the interim, and then resized once the config
|
|
is loaded.
|
|
"""
|
|
cache: LruCache = LruCache(max_size=100, server_name="test_server")
|
|
|
|
add_resizable_cache("foo", cache_resize_callback=cache.set_cache_factor)
|
|
self.assertEqual(cache.max_size, 50)
|
|
|
|
config: JsonDict = {"caches": {"per_cache_factors": {"foo": 3}}}
|
|
self.config.read_config(config)
|
|
self.config.resize_all_caches()
|
|
|
|
self.assertEqual(cache.max_size, 300)
|
|
|
|
def test_individual_instantiated_after_config_load(self) -> None:
|
|
"""
|
|
If a cache is instantiated after the config is read, it will be
|
|
immediately resized to the correct size given the per_cache_factor if
|
|
there is one.
|
|
"""
|
|
config: JsonDict = {"caches": {"per_cache_factors": {"foo": 2}}}
|
|
self.config.read_config(config, config_dir_path="", data_dir_path="")
|
|
self.config.resize_all_caches()
|
|
|
|
cache: LruCache = LruCache(max_size=100, server_name="test_server")
|
|
add_resizable_cache("foo", cache_resize_callback=cache.set_cache_factor)
|
|
self.assertEqual(cache.max_size, 200)
|
|
|
|
def test_global_instantiated_before_config_load(self) -> None:
|
|
"""
|
|
If a cache is instantiated before the config is read, it will be given
|
|
the default cache size in the interim, and then resized to the new
|
|
default cache size once the config is loaded.
|
|
"""
|
|
cache: LruCache = LruCache(max_size=100, server_name="test_server")
|
|
add_resizable_cache("foo", cache_resize_callback=cache.set_cache_factor)
|
|
self.assertEqual(cache.max_size, 50)
|
|
|
|
config: JsonDict = {"caches": {"global_factor": 4}}
|
|
self.config.read_config(config, config_dir_path="", data_dir_path="")
|
|
self.config.resize_all_caches()
|
|
|
|
self.assertEqual(cache.max_size, 400)
|
|
|
|
def test_global_instantiated_after_config_load(self) -> None:
|
|
"""
|
|
If a cache is instantiated after the config is read, it will be
|
|
immediately resized to the correct size given the global factor if there
|
|
is no per-cache factor.
|
|
"""
|
|
config: JsonDict = {"caches": {"global_factor": 1.5}}
|
|
self.config.read_config(config, config_dir_path="", data_dir_path="")
|
|
self.config.resize_all_caches()
|
|
|
|
cache: LruCache = LruCache(max_size=100, server_name="test_server")
|
|
add_resizable_cache("foo", cache_resize_callback=cache.set_cache_factor)
|
|
self.assertEqual(cache.max_size, 150)
|
|
|
|
def test_cache_with_asterisk_in_name(self) -> None:
|
|
"""Some caches have asterisks in their name, test that they are set correctly."""
|
|
|
|
config: JsonDict = {
|
|
"caches": {
|
|
"per_cache_factors": {"*cache_a*": 5, "cache_b": 6, "cache_c": 2}
|
|
}
|
|
}
|
|
self.config._environ = {
|
|
"SYNAPSE_CACHE_FACTOR_CACHE_A": "2",
|
|
"SYNAPSE_CACHE_FACTOR_CACHE_B": "3",
|
|
}
|
|
self.config.read_config(config, config_dir_path="", data_dir_path="")
|
|
self.config.resize_all_caches()
|
|
|
|
cache_a: LruCache = LruCache(max_size=100, server_name="test_server")
|
|
add_resizable_cache("*cache_a*", cache_resize_callback=cache_a.set_cache_factor)
|
|
self.assertEqual(cache_a.max_size, 200)
|
|
|
|
cache_b: LruCache = LruCache(max_size=100, server_name="test_server")
|
|
add_resizable_cache("*Cache_b*", cache_resize_callback=cache_b.set_cache_factor)
|
|
self.assertEqual(cache_b.max_size, 300)
|
|
|
|
cache_c: LruCache = LruCache(max_size=100, server_name="test_server")
|
|
add_resizable_cache("*cache_c*", cache_resize_callback=cache_c.set_cache_factor)
|
|
self.assertEqual(cache_c.max_size, 200)
|
|
|
|
def test_apply_cache_factor_from_config(self) -> None:
|
|
"""Caches can disable applying cache factor updates, mainly used by
|
|
event cache size.
|
|
"""
|
|
|
|
config: JsonDict = {"caches": {"event_cache_size": "10k"}}
|
|
self.config.read_config(config, config_dir_path="", data_dir_path="")
|
|
self.config.resize_all_caches()
|
|
|
|
cache: LruCache = LruCache(
|
|
max_size=self.config.event_cache_size,
|
|
apply_cache_factor_from_config=False,
|
|
server_name="test_server",
|
|
)
|
|
add_resizable_cache("event_cache", cache_resize_callback=cache.set_cache_factor)
|
|
|
|
self.assertEqual(cache.max_size, 10240)
|