mirror of
https://github.com/element-hq/synapse.git
synced 2026-04-26 23:55:33 +00:00
ac26cfac83
--- 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.
193 lines
6.4 KiB
Python
193 lines
6.4 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]
|
|
#
|
|
#
|
|
|
|
import json
|
|
|
|
from typing import Any as MemoryReactor # was: MemoryReactor from Twisted
|
|
|
|
from synapse.api.constants import RoomTypes
|
|
from synapse.rest import admin
|
|
from synapse.rest.client import login, room
|
|
from synapse.server import HomeServer
|
|
from synapse.storage.databases.main.room import _BackgroundUpdates
|
|
from synapse.util.clock import Clock
|
|
|
|
from tests.unittest import HomeserverTestCase
|
|
|
|
|
|
class RoomBackgroundUpdateStoreTestCase(HomeserverTestCase):
|
|
servlets = [
|
|
admin.register_servlets,
|
|
room.register_servlets,
|
|
login.register_servlets,
|
|
]
|
|
|
|
def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
|
|
self.store = hs.get_datastores().main
|
|
self.user_id = self.register_user("foo", "pass")
|
|
self.token = self.login("foo", "pass")
|
|
|
|
def _generate_room(self) -> str:
|
|
"""Create a room and return the room ID."""
|
|
return self.helper.create_room_as(self.user_id, tok=self.token)
|
|
|
|
def run_background_updates(self, update_name: str) -> None:
|
|
"""Insert and run the background update."""
|
|
self.get_success(
|
|
self.store.db_pool.simple_insert(
|
|
"background_updates",
|
|
{"update_name": update_name, "progress_json": "{}"},
|
|
)
|
|
)
|
|
|
|
# ... and tell the DataStore that it hasn't finished all updates yet
|
|
self.store.db_pool.updates._all_done = False
|
|
|
|
# Now let's actually drive the updates to completion
|
|
self.wait_for_background_updates()
|
|
|
|
def test_background_populate_rooms_creator_column(self) -> None:
|
|
"""Test that the background update to populate the rooms creator column
|
|
works properly.
|
|
"""
|
|
|
|
# Insert a room without the creator
|
|
room_id = self._generate_room()
|
|
self.get_success(
|
|
self.store.db_pool.simple_update(
|
|
table="rooms",
|
|
keyvalues={"room_id": room_id},
|
|
updatevalues={"creator": None},
|
|
desc="test",
|
|
)
|
|
)
|
|
|
|
# Make sure the test is starting out with a room without a creator
|
|
room_creator_before = self.get_success(
|
|
self.store.db_pool.simple_select_one_onecol(
|
|
table="rooms",
|
|
keyvalues={"room_id": room_id},
|
|
retcol="creator",
|
|
allow_none=True,
|
|
)
|
|
)
|
|
self.assertEqual(room_creator_before, None)
|
|
|
|
self.run_background_updates(_BackgroundUpdates.POPULATE_ROOMS_CREATOR_COLUMN)
|
|
|
|
# Make sure the background update filled in the room creator
|
|
room_creator_after = self.get_success(
|
|
self.store.db_pool.simple_select_one_onecol(
|
|
table="rooms",
|
|
keyvalues={"room_id": room_id},
|
|
retcol="creator",
|
|
allow_none=True,
|
|
)
|
|
)
|
|
self.assertEqual(room_creator_after, self.user_id)
|
|
|
|
def test_background_add_room_type_column(self) -> None:
|
|
"""Test that the background update to populate the `room_type` column in
|
|
`room_stats_state` works properly.
|
|
"""
|
|
|
|
# Create a room without a type
|
|
room_id = self._generate_room()
|
|
|
|
# Get event_id of the m.room.create event
|
|
event_id = self.get_success(
|
|
self.store.db_pool.simple_select_one_onecol(
|
|
table="current_state_events",
|
|
keyvalues={
|
|
"room_id": room_id,
|
|
"type": "m.room.create",
|
|
},
|
|
retcol="event_id",
|
|
)
|
|
)
|
|
|
|
# Fake a room creation event with a room type
|
|
event = {
|
|
"content": {
|
|
"creator": "@user:server.org",
|
|
"room_version": "9",
|
|
"type": RoomTypes.SPACE,
|
|
},
|
|
"type": "m.room.create",
|
|
}
|
|
self.get_success(
|
|
self.store.db_pool.simple_update(
|
|
table="event_json",
|
|
keyvalues={"event_id": event_id},
|
|
updatevalues={"json": json.dumps(event)},
|
|
desc="test",
|
|
)
|
|
)
|
|
|
|
self.run_background_updates(_BackgroundUpdates.ADD_ROOM_TYPE_COLUMN)
|
|
|
|
# Make sure the background update filled in the room type
|
|
room_type_after = self.get_success(
|
|
self.store.db_pool.simple_select_one_onecol(
|
|
table="room_stats_state",
|
|
keyvalues={"room_id": room_id},
|
|
retcol="room_type",
|
|
allow_none=True,
|
|
)
|
|
)
|
|
self.assertEqual(room_type_after, RoomTypes.SPACE)
|
|
|
|
def test_populate_stats_broken_rooms(self) -> None:
|
|
"""Ensure that re-populating room stats skips broken rooms."""
|
|
|
|
# Create a good room.
|
|
good_room_id = self._generate_room()
|
|
|
|
# Create a room and then break it by having no room version.
|
|
room_id = self._generate_room()
|
|
self.get_success(
|
|
self.store.db_pool.simple_update(
|
|
table="rooms",
|
|
keyvalues={"room_id": room_id},
|
|
updatevalues={"room_version": None},
|
|
desc="test",
|
|
)
|
|
)
|
|
|
|
# Nuke any current stats in the database.
|
|
self.get_success(
|
|
self.store.db_pool.simple_delete(
|
|
table="room_stats_state", keyvalues={"1": 1}, desc="test"
|
|
)
|
|
)
|
|
|
|
self.run_background_updates("populate_stats_process_rooms")
|
|
|
|
# Only the good room appears in the stats tables.
|
|
results = self.get_success(
|
|
self.store.db_pool.simple_select_onecol(
|
|
table="room_stats_state",
|
|
keyvalues={},
|
|
retcol="room_id",
|
|
)
|
|
)
|
|
self.assertEqual(results, [good_room_id])
|