From 172ce29b149afb91bbf728b88bffb117172a8f2c Mon Sep 17 00:00:00 2001
From: Sean Quah <8349537+squahtx@users.noreply.github.com>
Date: Tue, 19 Jul 2022 19:15:54 +0100
Subject: Fix spurious warning when fetching state after a missing prev event
 (#13258)

---
 synapse/handlers/federation_event.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'synapse/handlers/federation_event.py')

diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py
index 766d9849f5..e4a5b64d10 100644
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -1037,6 +1037,9 @@ class FederationEventHandler:
         # 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",
-- 
cgit 1.4.1