From b280ca44685d5e30ca5f9542fb81c24a2e92451c Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 3 Sep 2021 15:44:12 +0100 Subject: [PATCH 1/2] Allow room_alias_name to be handled by /createRoom calls routed to workers --- synapse/storage/databases/main/directory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/storage/databases/main/directory.py b/synapse/storage/databases/main/directory.py index 86075bc55b23..6daf8b8ffb58 100644 --- a/synapse/storage/databases/main/directory.py +++ b/synapse/storage/databases/main/directory.py @@ -75,8 +75,6 @@ async def get_aliases_for_room(self, room_id: str) -> List[str]: desc="get_aliases_for_room", ) - -class DirectoryStore(DirectoryWorkerStore): async def create_room_alias_association( self, room_alias: RoomAlias, @@ -126,6 +124,8 @@ def alias_txn(txn): 409, "Room alias %s already exists" % room_alias.to_string() ) + +class DirectoryStore(DirectoryWorkerStore): async def delete_room_alias(self, room_alias: RoomAlias) -> str: room_id = await self.db_pool.runInteraction( "delete_room_alias", self._delete_room_alias_txn, room_alias From 98a7dce3bfd03b662dfda1f2f474d1049d4e1862 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 3 Sep 2021 16:01:21 +0100 Subject: [PATCH 2/2] Changelog --- changelog.d/10757.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/10757.bugfix diff --git a/changelog.d/10757.bugfix b/changelog.d/10757.bugfix new file mode 100644 index 000000000000..bce36ef24221 --- /dev/null +++ b/changelog.d/10757.bugfix @@ -0,0 +1 @@ +Fix a bug which prevented calls to `/createRoom` that included the `room_alias_name` parameter from being handled by worker processes. \ No newline at end of file