Browse Source

♻️ use overflow threadpool rather than a standalone one for __exit__

pull/15372/head
oliver 3 months ago
parent
commit
943669e139
  1. 11
      fastapi/concurrency.py

11
fastapi/concurrency.py

@ -94,20 +94,15 @@ async def contextmanager_in_threadpool(
# can create race conditions/deadlocks if the context manager itself # can create race conditions/deadlocks if the context manager itself
# has its own internal pool (e.g. a database connection pool) # has its own internal pool (e.g. a database connection pool)
# to avoid this we let __exit__ run without a capacity limit # to avoid this we let __exit__ run without a capacity limit
# since we're creating a new limiter for each call, any non-zero limit
# works (1 is arbitrary)
exit_limiter = CapacityLimiter(1)
try: try:
yield await run_in_threadpool(cm.__enter__) yield await run_in_threadpool(cm.__enter__)
except Exception as e: except Exception as e:
ok = bool( ok = bool(
await anyio.to_thread.run_sync( await _run_in_threadpool_with_overflow(
cm.__exit__, type(e), e, e.__traceback__, limiter=exit_limiter cm.__exit__, type(e), e, e.__traceback__
) )
) )
if not ok: if not ok:
raise e raise e
else: else:
await anyio.to_thread.run_sync( await _run_in_threadpool_with_overflow(cm.__exit__, None, None, None)
cm.__exit__, None, None, None, limiter=exit_limiter
)

Loading…
Cancel
Save