Fix oldest_pdu_in_federation_staging (#10455)

If the staging area was empty we'd report an age of 51 years, which is not true or helpful.
matrix-org · Jul 27, 2021 · 5b22d5e · 5b22d5e
1 parent 076dead
commit 5b22d5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/changelog.d/10455.bugfix b/changelog.d/10455.bugfix
@@ -0,0 +1 @@
+Fix `synapse_federation_server_oldest_inbound_pdu_in_staging` Prometheus metric to not report a max age of 51 years when the queue is empty.
diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py
@@ -1227,12 +1227,15 @@ def _get_stats_for_federation_staging_txn(txn):
             (count,) = txn.fetchone()
 
             txn.execute(
-                "SELECT coalesce(min(received_ts), 0) FROM federation_inbound_events_staging"
+                "SELECT min(received_ts) FROM federation_inbound_events_staging"
             )
 
             (received_ts,) = txn.fetchone()
 
-            age = self._clock.time_msec() - received_ts
+            # If there is nothing in the staging area default it to 0.
+            age = 0
+            if received_ts is not None:
+                age = self._clock.time_msec() - received_ts
 
             return count, age
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix `synapse_federation_server_oldest_inbound_pdu_in_staging` Prometheus metric to not report a max age of 51 years when the queue is empty.