Skip to content

Prevent deadlock when pipeline task is cancelled #4061

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

Draft
audricschiltknecht wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Prevent deadlock when pipeline task is cancelled #4061

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
22 changes: 15 additions & 7 deletions src/pipecat/pipeline/task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,13 +854,21 @@ async def _process_push_queue(self):
running = True
cleanup_pipeline = True
while running:
frame = await self._push_queue.get()
await self._pipeline.queue_frame(frame)
if isinstance(frame, (CancelFrame, EndFrame, StopFrame)):
await self._wait_for_pipeline_end(frame)
running = not isinstance(frame, (CancelFrame, EndFrame, StopFrame))
cleanup_pipeline = not isinstance(frame, StopFrame)
self._push_queue.task_done()
try:
frame = await self._push_queue.get()
await self._pipeline.queue_frame(frame)
if isinstance(frame, (CancelFrame, EndFrame, StopFrame)):
await self._wait_for_pipeline_end(frame)
running = not isinstance(frame, (CancelFrame, EndFrame, StopFrame))
cleanup_pipeline = not isinstance(frame, StopFrame)
self._push_queue.task_done()
except asyncio.CancelledError:
logger.debug(f"{self}: _process_push_queue cancelled")
# FIXME: this leaves lots of dangling tasks...
self._pipeline_end_event.set()
self._pipeline_finished_event.set()
await self._cleanup(True)
raise
await self._cleanup(cleanup_pipeline)

async def _source_push_frame(self, frame: Frame, direction: FrameDirection):
Expand Down