Improve logging of replication (#16309)

matrix-org · Sep 13, 2023 · ab13fb0 · ab13fb0
1 parent 48387c5
commit ab13fb0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/changelog.d/16309.misc b/changelog.d/16309.misc
@@ -0,0 +1 @@
+Small improvements to logging in replication code.
diff --git a/synapse/replication/tcp/handler.py b/synapse/replication/tcp/handler.py
@@ -644,7 +644,7 @@ async def _process_position(
                     [stream.parse_row(row) for row in rows],
                 )
 
-            logger.info("Caught up with stream '%s' to %i", stream_name, cmd.new_token)
+        logger.info("Caught up with stream '%s' to %i", stream_name, cmd.new_token)
 
         # We've now caught up to position sent to us, notify handler.
         await self._replication_data_handler.on_position(

diff --git a/synapse/replication/tcp/resource.py b/synapse/replication/tcp/resource.py
@@ -191,7 +191,12 @@ async def _run_notifier_loop(self) -> None:
 
                         if updates:
                             logger.info(
-                                "Streaming: %s -> %s", stream.NAME, updates[-1][0]
+                                "Streaming: %s -> %s (limited: %s, updates: %s, max token: %s)",
+                                stream.NAME,
+                                updates[-1][0],
+                                limited,
+                                len(updates),
+                                current_token,
                             )
                             stream_updates_counter.labels(stream.NAME).inc(len(updates))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Small improvements to logging in replication code.