Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 319a805

Browse files
authored
Raise an exception when getting state at an outlier (#12191)
It seems like calling `_get_state_group_for_events` for an event where the state is unknown is an error. Accordingly, let's raise an exception rather than silently returning an empty result.
1 parent 9b43df1 commit 319a805

File tree

4 files changed

+87
-22
lines changed

4 files changed

+87
-22
lines changed

changelog.d/12191.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Avoid trying to calculate the state at outlier events.

synapse/storage/databases/main/state.py

+12-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
import logging
16-
from typing import TYPE_CHECKING, Dict, Iterable, Optional, Set, Tuple
16+
from typing import TYPE_CHECKING, Collection, Dict, Iterable, Optional, Set, Tuple
1717

1818
from frozendict import frozendict
1919

@@ -309,9 +309,13 @@ async def _get_state_group_for_event(self, event_id: str) -> Optional[int]:
309309
num_args=1,
310310
)
311311
async def _get_state_group_for_events(
312-
self, event_ids: Iterable[str]
312+
self, event_ids: Collection[str]
313313
) -> Dict[str, int]:
314-
"""Returns mapping event_id -> state_group"""
314+
"""Returns mapping event_id -> state_group.
315+
316+
Raises:
317+
RuntimeError if the state is unknown at any of the given events
318+
"""
315319
rows = await self.db_pool.simple_select_many_batch(
316320
table="event_to_state_groups",
317321
column="event_id",
@@ -321,7 +325,11 @@ async def _get_state_group_for_events(
321325
desc="_get_state_group_for_events",
322326
)
323327

324-
return {row["event_id"]: row["state_group"] for row in rows}
328+
res = {row["event_id"]: row["state_group"] for row in rows}
329+
for e in event_ids:
330+
if e not in res:
331+
raise RuntimeError("No state group for unknown or outlier event %s" % e)
332+
return res
325333

326334
async def get_referenced_state_groups(
327335
self, state_groups: Iterable[int]

synapse/storage/state.py

+20
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,10 @@ async def get_state_groups_ids(
571571
572572
Returns:
573573
dict of state_group_id -> (dict of (type, state_key) -> event id)
574+
575+
Raises:
576+
RuntimeError if we don't have a state group for one or more of the events
577+
(ie they are outliers or unknown)
574578
"""
575579
if not event_ids:
576580
return {}
@@ -659,6 +663,10 @@ async def get_state_for_events(
659663
660664
Returns:
661665
A dict of (event_id) -> (type, state_key) -> [state_events]
666+
667+
Raises:
668+
RuntimeError if we don't have a state group for one or more of the events
669+
(ie they are outliers or unknown)
662670
"""
663671
event_to_groups = await self.stores.main._get_state_group_for_events(event_ids)
664672

@@ -696,6 +704,10 @@ async def get_state_ids_for_events(
696704
697705
Returns:
698706
A dict from event_id -> (type, state_key) -> event_id
707+
708+
Raises:
709+
RuntimeError if we don't have a state group for one or more of the events
710+
(ie they are outliers or unknown)
699711
"""
700712
event_to_groups = await self.stores.main._get_state_group_for_events(event_ids)
701713

@@ -723,6 +735,10 @@ async def get_state_for_event(
723735
724736
Returns:
725737
A dict from (type, state_key) -> state_event
738+
739+
Raises:
740+
RuntimeError if we don't have a state group for the event (ie it is an
741+
outlier or is unknown)
726742
"""
727743
state_map = await self.get_state_for_events(
728744
[event_id], state_filter or StateFilter.all()
@@ -741,6 +757,10 @@ async def get_state_ids_for_event(
741757
742758
Returns:
743759
A dict from (type, state_key) -> state_event_id
760+
761+
Raises:
762+
RuntimeError if we don't have a state group for the event (ie it is an
763+
outlier or is unknown)
744764
"""
745765
state_map = await self.get_state_ids_for_events(
746766
[event_id], state_filter or StateFilter.all()

tests/handlers/test_federation.py

+54-18
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
from synapse.api.constants import EventTypes
2121
from synapse.api.errors import AuthError, Codes, LimitExceededError, SynapseError
2222
from synapse.api.room_versions import RoomVersions
23-
from synapse.events import EventBase
23+
from synapse.events import EventBase, make_event_from_dict
2424
from synapse.federation.federation_base import event_from_pdu_json
2525
from synapse.logging.context import LoggingContext, run_in_background
2626
from synapse.rest import admin
2727
from synapse.rest.client import login, room
2828
from synapse.server import HomeServer
29-
from synapse.types import create_requester
3029
from synapse.util import Clock
3130
from synapse.util.stringutils import random_string
3231

3332
from tests import unittest
33+
from tests.test_utils import event_injection
3434

3535
logger = logging.getLogger(__name__)
3636

@@ -39,7 +39,7 @@ def generate_fake_event_id() -> str:
3939
return "$fake_" + random_string(43)
4040

4141

42-
class FederationTestCase(unittest.HomeserverTestCase):
42+
class FederationTestCase(unittest.FederatingHomeserverTestCase):
4343
servlets = [
4444
admin.register_servlets,
4545
login.register_servlets,
@@ -219,41 +219,77 @@ def test_backfill_with_many_backward_extremities(self) -> None:
219219
# create the room
220220
user_id = self.register_user("kermit", "test")
221221
tok = self.login("kermit", "test")
222-
requester = create_requester(user_id)
223222

224223
room_id = self.helper.create_room_as(room_creator=user_id, tok=tok)
224+
room_version = self.get_success(self.store.get_room_version(room_id))
225+
226+
# we need a user on the remote server to be a member, so that we can send
227+
# extremity-causing events.
228+
self.get_success(
229+
event_injection.inject_member_event(
230+
self.hs, room_id, f"@user:{self.OTHER_SERVER_NAME}", "join"
231+
)
232+
)
225233

226-
ev1 = self.helper.send(room_id, "first message", tok=tok)
234+
send_result = self.helper.send(room_id, "first message", tok=tok)
235+
ev1 = self.get_success(
236+
self.store.get_event(send_result["event_id"], allow_none=False)
237+
)
238+
current_state = self.get_success(
239+
self.store.get_events_as_list(
240+
(self.get_success(self.store.get_current_state_ids(room_id))).values()
241+
)
242+
)
227243

228244
# Create "many" backward extremities. The magic number we're trying to
229245
# create more than is 5 which corresponds to the number of backward
230246
# extremities we slice off in `_maybe_backfill_inner`
247+
federation_event_handler = self.hs.get_federation_event_handler()
231248
for _ in range(0, 8):
232-
event_handler = self.hs.get_event_creation_handler()
233-
event, context = self.get_success(
234-
event_handler.create_event(
235-
requester,
249+
event = make_event_from_dict(
250+
self.add_hashes_and_signatures(
236251
{
252+
"origin_server_ts": 1,
237253
"type": "m.room.message",
238254
"content": {
239255
"msgtype": "m.text",
240256
"body": "message connected to fake event",
241257
},
242258
"room_id": room_id,
243-
"sender": user_id,
259+
"sender": f"@user:{self.OTHER_SERVER_NAME}",
260+
"prev_events": [
261+
ev1.event_id,
262+
# We're creating an backward extremity each time thanks
263+
# to this fake event
264+
generate_fake_event_id(),
265+
],
266+
# lazy: *everything* is an auth event
267+
"auth_events": [ev.event_id for ev in current_state],
268+
"depth": ev1.depth + 1,
244269
},
245-
prev_event_ids=[
246-
ev1["event_id"],
247-
# We're creating an backward extremity each time thanks
248-
# to this fake event
249-
generate_fake_event_id(),
250-
],
251-
)
270+
room_version,
271+
),
272+
room_version,
252273
)
274+
275+
# we poke this directly into _process_received_pdu, to avoid the
276+
# federation handler wanting to backfill the fake event.
253277
self.get_success(
254-
event_handler.handle_new_client_event(requester, event, context)
278+
federation_event_handler._process_received_pdu(
279+
self.OTHER_SERVER_NAME, event, state=current_state
280+
)
255281
)
256282

283+
# we should now have 8 backwards extremities.
284+
backwards_extremities = self.get_success(
285+
self.store.db_pool.simple_select_list(
286+
"event_backward_extremities",
287+
keyvalues={"room_id": room_id},
288+
retcols=["event_id"],
289+
)
290+
)
291+
self.assertEqual(len(backwards_extremities), 8)
292+
257293
current_depth = 1
258294
limit = 100
259295
with LoggingContext("receive_pdu"):

0 commit comments

Comments
 (0)