mirror of
https://github.com/element-hq/synapse.git
synced 2026-03-31 08:25:42 +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.
179 lines
5.5 KiB
Python
179 lines
5.5 KiB
Python
#
|
|
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
|
#
|
|
# Copyright 2015, 2016 OpenMarket Ltd
|
|
# 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]
|
|
#
|
|
#
|
|
|
|
import secrets
|
|
from typing import Generator, cast
|
|
|
|
from typing import Any as MemoryReactor # was: MemoryReactor from Twisted
|
|
|
|
from synapse.server import HomeServer
|
|
from synapse.util.clock import Clock
|
|
|
|
from tests import unittest
|
|
|
|
|
|
class UpdateUpsertManyTests(unittest.HomeserverTestCase):
|
|
def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
|
|
self.storage = hs.get_datastores().main
|
|
|
|
self.table_name = "table_" + secrets.token_hex(6)
|
|
self.get_success(
|
|
self.storage.db_pool.runInteraction(
|
|
"create",
|
|
lambda x, *a: x.execute(*a),
|
|
"CREATE TABLE %s (id INTEGER, username TEXT, value TEXT)"
|
|
% (self.table_name,),
|
|
)
|
|
)
|
|
self.get_success(
|
|
self.storage.db_pool.runInteraction(
|
|
"index",
|
|
lambda x, *a: x.execute(*a),
|
|
"CREATE UNIQUE INDEX %sindex ON %s(id, username)"
|
|
% (self.table_name, self.table_name),
|
|
)
|
|
)
|
|
|
|
def _dump_table_to_tuple(self) -> Generator[tuple[int, str, str], None, None]:
|
|
yield from cast(
|
|
list[tuple[int, str, str]],
|
|
self.get_success(
|
|
self.storage.db_pool.simple_select_list(
|
|
self.table_name, None, ["id, username, value"]
|
|
)
|
|
),
|
|
)
|
|
|
|
def test_upsert_many(self) -> None:
|
|
"""
|
|
Upsert_many will perform the upsert operation across a batch of data.
|
|
"""
|
|
# Add some data to an empty table
|
|
key_names = ["id", "username"]
|
|
value_names = ["value"]
|
|
key_values = [[1, "user1"], [2, "user2"]]
|
|
value_values = [["hello"], ["there"]]
|
|
|
|
self.get_success(
|
|
self.storage.db_pool.runInteraction(
|
|
"test",
|
|
self.storage.db_pool.simple_upsert_many_txn,
|
|
self.table_name,
|
|
key_names,
|
|
key_values,
|
|
value_names,
|
|
value_values,
|
|
)
|
|
)
|
|
|
|
# Check results are what we expect
|
|
self.assertEqual(
|
|
set(self._dump_table_to_tuple()),
|
|
{(1, "user1", "hello"), (2, "user2", "there")},
|
|
)
|
|
|
|
# Update only user2
|
|
key_values = [[2, "user2"]]
|
|
value_values = [["bleb"]]
|
|
|
|
self.get_success(
|
|
self.storage.db_pool.runInteraction(
|
|
"test",
|
|
self.storage.db_pool.simple_upsert_many_txn,
|
|
self.table_name,
|
|
key_names,
|
|
key_values,
|
|
value_names,
|
|
value_values,
|
|
)
|
|
)
|
|
|
|
# Check results are what we expect
|
|
self.assertEqual(
|
|
set(self._dump_table_to_tuple()),
|
|
{(1, "user1", "hello"), (2, "user2", "bleb")},
|
|
)
|
|
|
|
self.get_success(
|
|
self.storage.db_pool.runInteraction(
|
|
"test",
|
|
self.storage.db_pool.simple_upsert_many_txn,
|
|
self.table_name,
|
|
key_names=key_names,
|
|
key_values=[[2, "user2"]],
|
|
value_names=[],
|
|
value_values=[],
|
|
)
|
|
)
|
|
|
|
# Check results are what we expect
|
|
self.assertEqual(
|
|
set(self._dump_table_to_tuple()),
|
|
{(1, "user1", "hello"), (2, "user2", "bleb")},
|
|
)
|
|
|
|
def test_simple_update_many(self) -> None:
|
|
"""
|
|
simple_update_many performs many updates at once.
|
|
"""
|
|
# First add some data.
|
|
self.get_success(
|
|
self.storage.db_pool.simple_insert_many(
|
|
table=self.table_name,
|
|
keys=("id", "username", "value"),
|
|
values=[(1, "alice", "A"), (2, "bob", "B"), (3, "charlie", "C")],
|
|
desc="insert",
|
|
)
|
|
)
|
|
|
|
# Check the data made it to the table
|
|
self.assertEqual(
|
|
set(self._dump_table_to_tuple()),
|
|
{(1, "alice", "A"), (2, "bob", "B"), (3, "charlie", "C")},
|
|
)
|
|
|
|
# Now use simple_update_many
|
|
self.get_success(
|
|
self.storage.db_pool.simple_update_many(
|
|
table=self.table_name,
|
|
key_names=("username",),
|
|
key_values=(
|
|
("alice",),
|
|
("bob",),
|
|
("stranger",),
|
|
),
|
|
value_names=("value",),
|
|
value_values=(
|
|
("aaa!",),
|
|
("bbb!",),
|
|
("???",),
|
|
),
|
|
desc="update_many1",
|
|
)
|
|
)
|
|
|
|
# Check the table is how we expect:
|
|
# charlie has been left alone
|
|
self.assertEqual(
|
|
set(self._dump_table_to_tuple()),
|
|
{(1, "alice", "aaa!"), (2, "bob", "bbb!"), (3, "charlie", "C")},
|
|
)
|