From 211068b9a87bd795f8cf3ced12ac9aa3a9a89002 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Tue, 1 Nov 2022 18:09:19 +0000 Subject: [PATCH 1/2] Quieter logging for stateres failure at missing prev events Fixes #14344. --- synapse/handlers/federation_event.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py index 9ca5df7c7894..f7223b03c364 100644 --- a/synapse/handlers/federation_event.py +++ b/synapse/handlers/federation_event.py @@ -1065,10 +1065,9 @@ async def _compute_event_context_with_maybe_missing_prevs( state_res_store=StateResolutionStore(self._store), ) - except Exception: + except Exception as e: logger.warning( - "Error attempting to resolve state at missing prev_events", - exc_info=True, + "Error attempting to resolve state at missing prev_events: %s", e ) raise FederationError( "ERROR", From ca22514be1d68ae2d55a397d08cf2bef4f000e50 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Tue, 1 Nov 2022 18:11:37 +0000 Subject: [PATCH 2/2] Changelog --- changelog.d/14346.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/14346.misc diff --git a/changelog.d/14346.misc b/changelog.d/14346.misc new file mode 100644 index 000000000000..9833b0733a04 --- /dev/null +++ b/changelog.d/14346.misc @@ -0,0 +1 @@ +Concisely log a failure to resolve state due to missing `prev_events`.