apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-07-18 17:51:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix deadlock

Browse source
This commit is contained in:
Cyber MacGeddon 2024-12-25 14:08:28 +00:00
parent 312561561e
commit 0a2cefe556
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trustgraph-flow/trustgraph/gateway/mux.py
View file

@ -35,6 +35,7 @@ class MuxEndpoint(SocketEndpoint):
async def maybe_tidy_workers(self, workers): async def maybe_tidy_workers(self, workers):
while True: while True:
try: try:
await asyncio.wait_for( await asyncio.wait_for(
@ -44,7 +45,8 @@ class MuxEndpoint(SocketEndpoint):
# worker[0] now stopped # worker[0] now stopped
# FIXME: Delete reference??? # FIXME: Delete reference???
del workers[0]
workers.pop(0)
if len(workers) == 0: if len(workers) == 0:
break break
@ -57,6 +59,10 @@ class MuxEndpoint(SocketEndpoint):
async def start_request_task(self, ws, id, svc, request, workers): async def start_request_task(self, ws, id, svc, request, workers):
if svc not in self.services:
await ws.send_json({"id": id, "error": "Service not recognised"})
return
requestor = self.services[svc] requestor = self.services[svc]
async def responder(resp, fin): async def responder(resp, fin):
@ -68,8 +74,13 @@ class MuxEndpoint(SocketEndpoint):
# Wait for outstanding requests to go below MAX_OUTSTANDING_REQUESTS # Wait for outstanding requests to go below MAX_OUTSTANDING_REQUESTS
while len(workers) > MAX_OUTSTANDING_REQUESTS: while len(workers) > MAX_OUTSTANDING_REQUESTS:
# Fixes deadlock
# FIXME: Put it in its own loop
await asyncio.sleep(START_REQUEST_WAIT) await asyncio.sleep(START_REQUEST_WAIT)
await self.maybe_tidy_workers(workers)
worker = asyncio.create_task( worker = asyncio.create_task(
requestor.process(request, responder) requestor.process(request, responder)
) )