From d73437a702405e206d6dd39091fd395e363f3f45 Mon Sep 17 00:00:00 2001 From: Sean Quah Date: Tue, 12 Jul 2022 11:21:17 +0100 Subject: [PATCH 1/3] Fix spurious warning when fetching state after a missing prev event --- changelog.d/13258.misc | 1 + synapse/handlers/federation_event.py | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 changelog.d/13258.misc diff --git a/changelog.d/13258.misc b/changelog.d/13258.misc new file mode 100644 index 000000000000..a187c46aa609 --- /dev/null +++ b/changelog.d/13258.misc @@ -0,0 +1 @@ +Fix spurious warning when fetching state after a missing prev event. diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py index c74117c19aae..d417d79de0ca 100644 --- a/synapse/handlers/federation_event.py +++ b/synapse/handlers/federation_event.py @@ -1036,6 +1036,9 @@ async def _get_state_ids_after_missing_prev_event( # XXX: this doesn't sound right? it means that we'll end up with incomplete # state. failed_to_fetch = desired_events - event_metadata.keys() + # `event_id`'s missing from `event_metadata` because it's not necessarily a + # state event. We've already checked that we've fetched it above. + failed_to_fetch.discard(event_id) if failed_to_fetch: logger.warning( "Failed to fetch missing state events for %s %s", From ac0702fd7c0156ce76e397d9ddf43a91bf425ee8 Mon Sep 17 00:00:00 2001 From: Sean Quah <8349537+squahtx@users.noreply.github.com> Date: Tue, 12 Jul 2022 17:54:19 +0100 Subject: [PATCH 2/3] Update synapse/handlers/federation_event.py Co-authored-by: David Robertson --- synapse/handlers/federation_event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py index d417d79de0ca..f22e5f9d6993 100644 --- a/synapse/handlers/federation_event.py +++ b/synapse/handlers/federation_event.py @@ -1036,7 +1036,7 @@ async def _get_state_ids_after_missing_prev_event( # XXX: this doesn't sound right? it means that we'll end up with incomplete # state. failed_to_fetch = desired_events - event_metadata.keys() - # `event_id`'s missing from `event_metadata` because it's not necessarily a + # `event_id` could be missing from `event_metadata` because it's not necessarily a # state event. We've already checked that we've fetched it above. failed_to_fetch.discard(event_id) if failed_to_fetch: From 293404c3afc21cc722ec321382b6f114d7e12ca8 Mon Sep 17 00:00:00 2001 From: Sean Quah <8349537+squahtx@users.noreply.github.com> Date: Tue, 12 Jul 2022 17:55:02 +0100 Subject: [PATCH 3/3] Update synapse/handlers/federation_event.py --- synapse/handlers/federation_event.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py index f22e5f9d6993..1a14ea168834 100644 --- a/synapse/handlers/federation_event.py +++ b/synapse/handlers/federation_event.py @@ -1036,8 +1036,8 @@ async def _get_state_ids_after_missing_prev_event( # XXX: this doesn't sound right? it means that we'll end up with incomplete # state. failed_to_fetch = desired_events - event_metadata.keys() - # `event_id` could be missing from `event_metadata` because it's not necessarily a - # state event. We've already checked that we've fetched it above. + # `event_id` could be missing from `event_metadata` because it's not necessarily + # a state event. We've already checked that we've fetched it above. failed_to_fetch.discard(event_id) if failed_to_fetch: logger.warning(