Fix spurious warning when fetching state after a missing prev event (#…

…13258)
matrix-org · Jul 19, 2022 · 172ce29 · 172ce29
1 parent a6895dd
commit 172ce29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog.d/13258.misc 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
@@ -1037,6 +1037,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` 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(
                 "Failed to fetch missing state events for %s %s",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix spurious warning when fetching state after a missing prev event.