Skip to content

Fixed SSE request not getting canceled and getting SSE stuck #2806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joeyballentine merged 1 commit into from
Apr 19, 2024
Merged

Fixed SSE request not getting canceled and getting SSE stuck #2806

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions backend/src/server_process_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ def __init__(self, flags: Iterable[str] = []):
self._session = None
self._is_ready = False
self._is_checking_ready = False
self._manually_close: set[aiohttp.ClientResponse] = set()

async def start(self, extra_flags: Iterable[str] = []):
logger.info(f"Starting worker process on port {self._port}...")
Expand All @@ -158,6 +159,9 @@ async def stop(self):
if self._process:
self._process.close()
if self._session:
for resp in self._manually_close:
resp.close()
self._manually_close.clear()
await self._session.close()
logger.info("Worker process stopped")

Expand Down Expand Up @@ -238,8 +242,12 @@ async def get_sse(self, request: Request):
data=request.body,
timeout=aiohttp.ClientTimeout(total=60 * 60, connect=5),
) as resp:
async for data, _ in resp.content.iter_chunks():
yield data
self._manually_close.add(resp)
try:
async for data, _ in resp.content.iter_chunks():
yield data
finally:
self._manually_close.remove(resp)

async def get_packages(self):
await self.wait_for_ready()
Expand Down