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

Commit 49d04e4

Browse files
Add metrics to track how the rate limiter is affecting requests (sleep/reject) (#13534)
Related to #13499 Part of #13356
1 parent 8bdf2bd commit 49d04e4

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-8
lines changed

changelog.d/13534.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add metrics to track how the rate limiter is affecting requests (sleep/reject).

synapse/util/ratelimitutils.py

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import typing
1919
from typing import Any, DefaultDict, Iterator, List, Set
2020

21+
from prometheus_client.core import Counter
22+
2123
from twisted.internet import defer
2224

2325
from synapse.api.errors import LimitExceededError
@@ -37,6 +39,9 @@
3739
logger = logging.getLogger(__name__)
3840

3941

42+
# Track how much the ratelimiter is affecting requests
43+
rate_limit_sleep_counter = Counter("synapse_rate_limit_sleep", "")
44+
rate_limit_reject_counter = Counter("synapse_rate_limit_reject", "")
4045
queue_wait_timer = Histogram(
4146
"synapse_rate_limit_queue_wait_time_seconds",
4247
"sec",
@@ -84,7 +89,7 @@ def ratelimit(self, host: str) -> "_GeneratorContextManager[defer.Deferred[None]
8489
Returns:
8590
context manager which returns a deferred.
8691
"""
87-
return self.ratelimiters[host].ratelimit()
92+
return self.ratelimiters[host].ratelimit(host)
8893

8994

9095
class _PerHostRatelimiter:
@@ -119,12 +124,14 @@ def __init__(self, clock: Clock, config: FederationRatelimitSettings):
119124
self.request_times: List[int] = []
120125

121126
@contextlib.contextmanager
122-
def ratelimit(self) -> "Iterator[defer.Deferred[None]]":
127+
def ratelimit(self, host: str) -> "Iterator[defer.Deferred[None]]":
123128
# `contextlib.contextmanager` takes a generator and turns it into a
124129
# context manager. The generator should only yield once with a value
125130
# to be returned by manager.
126131
# Exceptions will be reraised at the yield.
127132

133+
self.host = host
134+
128135
request_id = object()
129136
ret = self._on_enter(request_id)
130137
try:
@@ -144,6 +151,8 @@ def _on_enter(self, request_id: object) -> "defer.Deferred[None]":
144151
# sleeping or in the ready queue).
145152
queue_size = len(self.ready_request_queue) + len(self.sleeping_requests)
146153
if queue_size > self.reject_limit:
154+
logger.debug("Ratelimiter(%s): rejecting request", self.host)
155+
rate_limit_reject_counter.inc()
147156
raise LimitExceededError(
148157
retry_after_ms=int(self.window_size / self.sleep_limit)
149158
)
@@ -155,7 +164,8 @@ def queue_request() -> "defer.Deferred[None]":
155164
queue_defer: defer.Deferred[None] = defer.Deferred()
156165
self.ready_request_queue[request_id] = queue_defer
157166
logger.info(
158-
"Ratelimiter: queueing request (queue now %i items)",
167+
"Ratelimiter(%s): queueing request (queue now %i items)",
168+
self.host,
159169
len(self.ready_request_queue),
160170
)
161171

@@ -164,19 +174,28 @@ def queue_request() -> "defer.Deferred[None]":
164174
return defer.succeed(None)
165175

166176
logger.debug(
167-
"Ratelimit [%s]: len(self.request_times)=%d",
177+
"Ratelimit(%s) [%s]: len(self.request_times)=%d",
178+
self.host,
168179
id(request_id),
169180
len(self.request_times),
170181
)
171182

172183
if len(self.request_times) > self.sleep_limit:
173-
logger.debug("Ratelimiter: sleeping request for %f sec", self.sleep_sec)
184+
logger.debug(
185+
"Ratelimiter(%s) [%s]: sleeping request for %f sec",
186+
self.host,
187+
id(request_id),
188+
self.sleep_sec,
189+
)
190+
rate_limit_sleep_counter.inc()
174191
ret_defer = run_in_background(self.clock.sleep, self.sleep_sec)
175192

176193
self.sleeping_requests.add(request_id)
177194

178195
def on_wait_finished(_: Any) -> "defer.Deferred[None]":
179-
logger.debug("Ratelimit [%s]: Finished sleeping", id(request_id))
196+
logger.debug(
197+
"Ratelimit(%s) [%s]: Finished sleeping", self.host, id(request_id)
198+
)
180199
self.sleeping_requests.discard(request_id)
181200
queue_defer = queue_request()
182201
return queue_defer
@@ -186,7 +205,9 @@ def on_wait_finished(_: Any) -> "defer.Deferred[None]":
186205
ret_defer = queue_request()
187206

188207
def on_start(r: object) -> object:
189-
logger.debug("Ratelimit [%s]: Processing req", id(request_id))
208+
logger.debug(
209+
"Ratelimit(%s) [%s]: Processing req", self.host, id(request_id)
210+
)
190211
self.current_processing.add(request_id)
191212
return r
192213

@@ -217,7 +238,7 @@ def on_both(r: object) -> object:
217238
return make_deferred_yieldable(ret_defer)
218239

219240
def _on_exit(self, request_id: object) -> None:
220-
logger.debug("Ratelimit [%s]: Processed req", id(request_id))
241+
logger.debug("Ratelimit(%s) [%s]: Processed req", self.host, id(request_id))
221242
self.current_processing.discard(request_id)
222243
try:
223244
# start processing the next item on the queue.

0 commit comments

Comments
 (0)