Skip to content

Commit

Permalink
Fix GunicornWebWorker max_requests_jitter not work (#7518)
Browse files Browse the repository at this point in the history
`GunicornWebWorker` use `self.cfg.max_requests` which is not add jitter,
from
https://github.com/benoitc/gunicorn/blob/master/gunicorn/workers/base.py#L56-L60,
the correct way is to use `sef.max_requests`

(cherry picked from commit 8bd42e7)
  • Loading branch information
phyng authored and patchback[bot] committed Aug 12, 2023
1 parent a105d1d commit c71f644
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGES/7518.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix GunicornWebWorker max_requests_jitter not work
2 changes: 1 addition & 1 deletion aiohttp/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ async def _run(self) -> None:
self.notify()

cnt = server.requests_count
if self.cfg.max_requests and cnt > self.cfg.max_requests:
if self.max_requests and cnt > self.max_requests:
self.alive = False
self.log.info("Max requests, shutting down: %s", self)

Expand Down
4 changes: 2 additions & 2 deletions tests/test_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ async def test__run_ok_parent_changed(
worker.sockets = [sock]
worker.log = mock.Mock()
worker.loop = loop
worker.max_requests = 0
worker.cfg.access_log_format = ACCEPTABLE_LOG_FORMAT
worker.cfg.max_requests = 0
worker.cfg.is_ssl = False

await worker._run()
Expand All @@ -240,8 +240,8 @@ async def test__run_exc(
worker.sockets = [sock]
worker.log = mock.Mock()
worker.loop = loop
worker.max_requests = 0
worker.cfg.access_log_format = ACCEPTABLE_LOG_FORMAT
worker.cfg.max_requests = 0
worker.cfg.is_ssl = False

def raiser() -> None:
Expand Down

0 comments on commit c71f644

Please sign in to comment.