mirror of
https://github.com/element-hq/synapse.git
synced 2026-04-04 03:25:44 +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.
135 lines
4.5 KiB
Python
135 lines
4.5 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright 2014-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 typing import Any as MemoryReactor # was: MemoryReactor from Twisted
|
|
|
|
from synapse.server import HomeServer
|
|
from synapse.storage.database import LoggingTransaction
|
|
from synapse.storage.engines import PostgresEngine
|
|
from synapse.types import UserID
|
|
from synapse.util.clock import Clock
|
|
|
|
from tests import unittest
|
|
|
|
|
|
class ProfileStoreTestCase(unittest.HomeserverTestCase):
|
|
def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
|
|
self.store = hs.get_datastores().main
|
|
|
|
self.u_frank = UserID.from_string("@frank:test")
|
|
|
|
def test_displayname(self) -> None:
|
|
self.get_success(self.store.create_profile(self.u_frank))
|
|
|
|
self.get_success(self.store.set_profile_displayname(self.u_frank, "Frank"))
|
|
|
|
self.assertEqual(
|
|
"Frank",
|
|
(self.get_success(self.store.get_profile_displayname(self.u_frank))),
|
|
)
|
|
|
|
# test set to None
|
|
self.get_success(self.store.set_profile_displayname(self.u_frank, None))
|
|
|
|
self.assertIsNone(
|
|
self.get_success(self.store.get_profile_displayname(self.u_frank))
|
|
)
|
|
|
|
def test_avatar_url(self) -> None:
|
|
self.get_success(self.store.create_profile(self.u_frank))
|
|
|
|
self.get_success(
|
|
self.store.set_profile_avatar_url(self.u_frank, "http://my.site/here")
|
|
)
|
|
|
|
self.assertEqual(
|
|
"http://my.site/here",
|
|
(self.get_success(self.store.get_profile_avatar_url(self.u_frank))),
|
|
)
|
|
|
|
# test set to None
|
|
self.get_success(self.store.set_profile_avatar_url(self.u_frank, None))
|
|
|
|
self.assertIsNone(
|
|
self.get_success(self.store.get_profile_avatar_url(self.u_frank))
|
|
)
|
|
|
|
def test_profiles_bg_migration(self) -> None:
|
|
"""
|
|
Test background job that copies entries from column user_id to full_user_id, adding
|
|
the hostname in the process.
|
|
"""
|
|
updater = self.hs.get_datastores().main.db_pool.updates
|
|
|
|
# drop the constraint so we can insert nulls in full_user_id to populate the test
|
|
if isinstance(self.store.database_engine, PostgresEngine):
|
|
|
|
def f(txn: LoggingTransaction) -> None:
|
|
txn.execute(
|
|
"ALTER TABLE profiles DROP CONSTRAINT full_user_id_not_null"
|
|
)
|
|
|
|
self.get_success(self.store.db_pool.runInteraction("", f))
|
|
|
|
for i in range(70):
|
|
self.get_success(
|
|
self.store.db_pool.simple_insert(
|
|
"profiles",
|
|
{"user_id": f"hello{i:02}"},
|
|
)
|
|
)
|
|
|
|
# re-add the constraint so that when it's validated it actually exists
|
|
if isinstance(self.store.database_engine, PostgresEngine):
|
|
|
|
def f(txn: LoggingTransaction) -> None:
|
|
txn.execute(
|
|
"ALTER TABLE profiles ADD CONSTRAINT full_user_id_not_null CHECK (full_user_id IS NOT NULL) NOT VALID"
|
|
)
|
|
|
|
self.get_success(self.store.db_pool.runInteraction("", f))
|
|
|
|
self.get_success(
|
|
self.store.db_pool.simple_insert(
|
|
"background_updates",
|
|
values={
|
|
"update_name": "populate_full_user_id_profiles",
|
|
"progress_json": "{}",
|
|
},
|
|
)
|
|
)
|
|
|
|
self.get_success(
|
|
updater.run_background_updates(False),
|
|
)
|
|
|
|
expected_values = []
|
|
for i in range(70):
|
|
expected_values.append((f"@hello{i:02}:{self.hs.hostname}",))
|
|
|
|
res = self.get_success(
|
|
self.store.db_pool.execute(
|
|
"", "SELECT full_user_id from profiles ORDER BY full_user_id"
|
|
)
|
|
)
|
|
self.assertEqual(len(res), len(expected_values))
|
|
self.assertEqual(res, expected_values)
|