Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Tweak logging for when a worker waits for its view of a replication stream to catch up. (#15120) #15120

Merged
merged 3 commits into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/15120.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Tweak logging for when a worker waits for its view of a replication stream to catch up.
12 changes: 10 additions & 2 deletions synapse/replication/tcp/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,15 +370,23 @@ async def wait_for_stream_position(
# We measure here to get in flight counts and average waiting time.
with Measure(self._clock, "repl.wait_for_stream_position"):
logger.info(
"Waiting for repl stream %r to reach %s (%s)",
"Waiting for repl stream %r to reach %s (%s); currently at: %s",
stream_name,
position,
instance_name,
current_position,
)
try:
await make_deferred_yieldable(deferred)
except defer.TimeoutError:
logger.error("Timed out waiting for stream %s", stream_name)
logger.error(
"Timed out waiting for repl stream %r to reach %s (%s)"
"; currently at: %s",
stream_name,
position,
instance_name,
self._streams[stream_name].current_token(instance_name),
)
return

logger.info(
Expand Down