PipelineTask: always try to cancel things

In a previous commit we only cleanup things if the user run
`task.cancel()`. However, if the task finishes cleanly we were not cancelling
anything.
This commit is contained in:
Aleix Conchillo Flaqué
2025-08-05 16:17:03 -07:00
parent de2ae9a2ec
commit d22d2da03d

View File

@@ -459,20 +459,10 @@ class PipelineTask(BasePipelineTask):
# awaiting a task.
pass
finally:
# We only cancel things cleanly if we know we are the ones
# cancelling. It's possibe that we get an asyncio.CancelledError
# from the outside, in which case it is very likely other tasks have
# been already cancelled (e.g. when python is shutting down) so we
# can't assume things are being cancelled nicely.
if self._cancelled:
await self._cancel_tasks()
await self._cleanup(cleanup_pipeline)
if self._check_dangling_tasks:
self._print_dangling_tasks()
else:
logger.warning(
f"Pipeline task {self} is not being cancelled properly (use cancel() method)"
)
await self._cancel_tasks()
await self._cleanup(cleanup_pipeline)
if self._check_dangling_tasks:
self._print_dangling_tasks()
self._finished = True
async def queue_frame(self, frame: Frame):