Fix race condition with request handlers on shutdown (#8271)

aio-libs · Mar 30, 2024 · e0d9d3a · e0d9d3a
1 parent 509fb26
commit e0d9d3a
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
@@ -299,6 +299,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()