diff options
| author | Eric Eastwood <erice@element.io> | 2023-06-05 23:38:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 23:38:52 -0500 |
| commit | f9561b9e37e4cbd97a71dd10549f1f03d3f01b5e (patch) | |
| tree | 22647948b98abd9584157a61ed9f97e81c7550f1 | |
| parent | Bump types-requests from 2.31.0.0 to 2.31.0.1 (#15715) (diff) | |
| download | synapse-f9561b9e37e4cbd97a71dd10549f1f03d3f01b5e.tar.xz | |
Some house keeping on `maybe_backfill()` functions (#15709)
| -rw-r--r-- | changelog.d/15709.misc | 1 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/changelog.d/15709.misc b/changelog.d/15709.misc new file mode 100644 index 0000000000..e9ce84a940 --- /dev/null +++ b/changelog.d/15709.misc @@ -0,0 +1 @@ +Update docstring and traces on `maybe_backfill()` functions. diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 2eb28d55ac..57d6b70cff 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -200,6 +200,7 @@ class FederationHandler: ) @trace + @tag_args async def maybe_backfill( self, room_id: str, current_depth: int, limit: int ) -> bool: @@ -214,6 +215,9 @@ class FederationHandler: limit: The number of events that the pagination request will return. This is used as part of the heuristic to decide if we should back paginate. + + Returns: + True if we actually tried to backfill something, otherwise False. """ # Starting the processing time here so we can include the room backfill # linearizer lock queue in the timing @@ -227,6 +231,8 @@ class FederationHandler: processing_start_time=processing_start_time, ) + @trace + @tag_args async def _maybe_backfill_inner( self, room_id: str, @@ -247,6 +253,9 @@ class FederationHandler: limit: The max number of events to request from the remote federated server. processing_start_time: The time when `maybe_backfill` started processing. Only used for timing. If `None`, no timing observation will be made. + + Returns: + True if we actually tried to backfill something, otherwise False. """ backwards_extremities = [ _BackfillPoint(event_id, depth, _BackfillPointType.BACKWARDS_EXTREMITY) @@ -302,6 +311,14 @@ class FederationHandler: len(sorted_backfill_points), sorted_backfill_points, ) + set_tag( + SynapseTags.RESULT_PREFIX + "sorted_backfill_points", + str(sorted_backfill_points), + ) + set_tag( + SynapseTags.RESULT_PREFIX + "sorted_backfill_points.length", + str(len(sorted_backfill_points)), + ) # If we have no backfill points lower than the `current_depth` then # either we can a) bail or b) still attempt to backfill. We opt to try |