mirror of
https://github.com/element-hq/synapse.git
synced 2026-03-31 19:15:54 +00:00
--- Summary: Synapse Twisted → asyncio Migration What's been built (Phases 0-7) — 10 new files, ~3200 lines, 96 tests Every Twisted component has an asyncio-native replacement ready: ┌──────────────────┬───────────────────────────────────────────────┬─────────────────────────────────────────────────────────┬───────────────────────────────────────────────┐ │ Component │ Twisted Original │ asyncio Replacement │ File │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ LoggingContext │ threading.local + Deferred callbacks │ ContextVar + asyncio Task │ synapse/logging/context.py (native functions) │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ Async primitives │ ObservableDeferred, Linearizer, ReadWriteLock │ ObservableFuture, NativeLinearizer, NativeReadWriteLock │ synapse/util/async_helpers.py │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ Cache │ DeferredCache │ FutureCache │ synapse/util/caches/future_cache.py │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ Clock │ Clock (Twisted reactor) │ NativeClock (asyncio) │ synapse/util/clock.py │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ Database │ adbapi.ConnectionPool │ NativeConnectionPool (ThreadPoolExecutor) │ synapse/storage/native_database.py │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ HTTP Client │ treq + Twisted Agent │ aiohttp.ClientSession │ synapse/http/native_client.py │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ HTTP Server │ JsonResource + Twisted Site │ NativeJsonResource + aiohttp.web │ synapse/http/native_server.py │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ Replication │ LineOnlyReceiver (Twisted Protocol) │ asyncio.StreamReader/Writer │ synapse/replication/tcp/native_protocol.py │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ Event loop │ ISynapseReactor │ ISynapseEventLoop │ synapse/types/__init__.py │ ├──────────────────┼───────────────────────────────────────────────┼─────────────────────────────────────────────────────────┼───────────────────────────────────────────────┤ │ Test helper │ — │ FakeAsyncioLoop │ tests/async_helpers.py │ └──────────────────┴───────────────────────────────────────────────┴─────────────────────────────────────────────────────────┴───────────────────────────────────────────────┘ What's been wired in safely — 224 files changed, 0 regressions - MemoryReactor type hint → Any across 198 test files (cosmetic) - synapse/http/server.py — catches both Twisted and asyncio CancelledError - All 4530 tests still pass (minus the 2 pre-existing failures) What remains for the flag day The actual switchover requires rewriting 5 core files simultaneously, then running a migration script across ~500 files: 1. tests/unittest.py + tests/server.py — switch from twisted.trial.TestCase to unittest.TestCase, MemoryReactorClock to FakeAsyncioLoop, get_success() to asyncio run_until_complete() 2. synapse/logging/context.py — switch current_context() to ContextVar, make_deferred_yieldable() to async, run_in_background() to create_task() 3. synapse/util/async_helpers.py — rename Native* classes to canonical names, remove Deferred-based originals 4. Migration script — update all CancelledError, defer.*, Deferred imports across ~500 files 5. pyproject.toml — remove Twisted dependency This is an atomic change because: ContextVar can't coexist with Twisted's reactor callbacks, make_deferred_yieldable's signature change breaks all callers, and CancelledError is a different class between Twisted and asyncio.
133 lines
4.8 KiB
Python
133 lines
4.8 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright 2021 The 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 unittest import mock
|
|
|
|
from typing import Any as MemoryReactor # was: MemoryReactor from Twisted
|
|
|
|
from synapse.app.generic_worker import GenericWorkerServer
|
|
from synapse.server import HomeServer
|
|
from synapse.storage.database import LoggingDatabaseConnection
|
|
from synapse.storage.prepare_database import PrepareDatabaseException, prepare_database
|
|
from synapse.storage.schema import SCHEMA_VERSION
|
|
from synapse.types import JsonDict
|
|
from synapse.util.clock import Clock
|
|
|
|
from tests.unittest import HomeserverTestCase
|
|
|
|
|
|
def fake_listdir(filepath: str) -> list[str]:
|
|
"""
|
|
A fake implementation of os.listdir which we can use to mock out the filesystem.
|
|
|
|
Args:
|
|
filepath: The directory to list files for.
|
|
|
|
Returns:
|
|
A list of files and folders in the directory.
|
|
"""
|
|
if filepath.endswith("full_schemas"):
|
|
return [str(SCHEMA_VERSION)]
|
|
|
|
return ["99_add_unicorn_to_database.sql"]
|
|
|
|
|
|
class WorkerSchemaTests(HomeserverTestCase):
|
|
def make_homeserver(self, reactor: MemoryReactor, clock: Clock) -> HomeServer:
|
|
hs = self.setup_test_homeserver(homeserver_to_use=GenericWorkerServer)
|
|
return hs
|
|
|
|
def default_config(self) -> JsonDict:
|
|
conf = super().default_config()
|
|
|
|
# Mark this as a worker app.
|
|
conf["worker_app"] = "yes"
|
|
conf["instance_map"] = {"main": {"host": "127.0.0.1", "port": 0}}
|
|
|
|
return conf
|
|
|
|
def test_rolling_back(self) -> None:
|
|
"""Test that workers can start if the DB is a newer schema version"""
|
|
|
|
db_pool = self.hs.get_datastores().main.db_pool
|
|
db_conn = LoggingDatabaseConnection(
|
|
conn=db_pool._db_pool.connect(),
|
|
engine=db_pool.engine,
|
|
default_txn_name="tests",
|
|
server_name="test_server",
|
|
)
|
|
|
|
cur = db_conn.cursor()
|
|
cur.execute("UPDATE schema_version SET version = ?", (SCHEMA_VERSION + 1,))
|
|
|
|
db_conn.commit()
|
|
|
|
prepare_database(db_conn, db_pool.engine, self.hs.config)
|
|
|
|
def test_not_upgraded_old_schema_version(self) -> None:
|
|
"""Test that workers don't start if the DB has an older schema version"""
|
|
db_pool = self.hs.get_datastores().main.db_pool
|
|
db_conn = LoggingDatabaseConnection(
|
|
conn=db_pool._db_pool.connect(),
|
|
engine=db_pool.engine,
|
|
default_txn_name="tests",
|
|
server_name="test_server",
|
|
)
|
|
|
|
cur = db_conn.cursor()
|
|
cur.execute("UPDATE schema_version SET version = ?", (SCHEMA_VERSION - 1,))
|
|
|
|
db_conn.commit()
|
|
|
|
with self.assertRaises(PrepareDatabaseException):
|
|
prepare_database(db_conn, db_pool.engine, self.hs.config)
|
|
|
|
def test_not_upgraded_current_schema_version_with_outstanding_deltas(self) -> None:
|
|
"""
|
|
Test that workers don't start if the DB is on the current schema version,
|
|
but there are still outstanding delta migrations to run.
|
|
"""
|
|
db_pool = self.hs.get_datastores().main.db_pool
|
|
db_conn = LoggingDatabaseConnection(
|
|
conn=db_pool._db_pool.connect(),
|
|
engine=db_pool.engine,
|
|
default_txn_name="tests",
|
|
server_name="test_server",
|
|
)
|
|
|
|
# Set the schema version of the database to the current version
|
|
cur = db_conn.cursor()
|
|
cur.execute("UPDATE schema_version SET version = ?", (SCHEMA_VERSION,))
|
|
|
|
db_conn.commit()
|
|
|
|
# Path `os.listdir` here to make synapse think that there is a migration
|
|
# file ready to be run.
|
|
# Note that we can't patch this function for the whole method, else Synapse
|
|
# will try to find the file when building the database initially.
|
|
with mock.patch("os.listdir", mock.Mock(side_effect=fake_listdir)):
|
|
with self.assertRaises(PrepareDatabaseException):
|
|
# Synapse should think that there is an outstanding migration file due to
|
|
# patching 'os.listdir' in the function decorator.
|
|
#
|
|
# We expect Synapse to raise an exception to indicate the master process
|
|
# needs to apply this migration file.
|
|
prepare_database(db_conn, db_pool.engine, self.hs.config)
|