Fix incorrect time magnitude on delayed call (#10195)

Fixes #10030. We were expecting milliseconds where we should have provided a value in seconds. The impact of this bug isn't too bad. The code is intended to count the number of remote servers that the homeserver can see and report that as a metric. This metric is supposed to run initially 1 second after server startup, and every 60s as well. Instead, it ran 1,000 seconds after server startup, and every 60s after startup. This fix allows for the correct metrics to be collected immediately, as well as preventing a random collection 1,000s in the future after startup.
matrix-org · Jun 17, 2021 · 6f1a28d · 6f1a28d
1 parent a911dd7
commit 6f1a28d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/10195.bugfix b/changelog.d/10195.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synpase 1.7.2 where remote server count metrics collection would be incorrectly delayed on startup. Found by @heftig.
diff --git a/synapse/storage/databases/main/roommember.py b/synapse/storage/databases/main/roommember.py
@@ -90,7 +90,7 @@ def __init__(self, database: DatabasePool, db_conn, hs):
                 60 * 1000,
             )
             self.hs.get_clock().call_later(
-                1000,
+                1,
                 self._count_known_servers,
             )
             LaterGauge(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a bug introduced in Synpase 1.7.2 where remote server count metrics collection would be incorrectly delayed on startup. Found by @heftig.
-Original file line number
+Diff line change
@@ Expand Up / @@ -90,7 +90,7 @@ def __init__(self, database: DatabasePool, db_conn, hs): @@
 * 1000,
                 )
                 self.hs.get_clock().call_later(
-,
+,
                     self._count_known_servers,
                 )
                 LaterGauge(
@@ Expand Down @@