[PR #8271/e0d9d3ab backport][3.9] Fix race condition with request han…

…dlers on shutdown (#8272) **This is a backport of PR #8271 as merged into master (e0d9d3a).** Co-authored-by: Sam Bull <git@sambull.org>
aio-libs · Mar 31, 2024 · 46e8f64 · 46e8f64
1 parent 3a13bd5
commit 46e8f64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGES/8271.bugfix.rst b/CHANGES/8271.bugfix.rst
@@ -0,0 +1 @@
+Fixed a race condition with incoming connections during server shutdown -- by :user:`Dreamsorcerer`.
diff --git a/aiohttp/web_runner.py b/aiohttp/web_runner.py
@@ -307,6 +307,9 @@ async def cleanup(self) -> None:
             await site.stop()
 
         if self._server:  # If setup succeeded
+            # Yield to event loop to ensure incoming requests prior to stopping the sites
+            # have all started to be handled before we proceed to close idle connections.
+            await asyncio.sleep(0)
             self._server.pre_shutdown()
             await self.shutdown()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed a race condition with incoming connections during server shutdown -- by :user:`Dreamsorcerer`.