dstandish commented on code in PR #63568:
URL: https://github.com/apache/airflow/pull/63568#discussion_r2975845905
##########
airflow-core/src/airflow/jobs/triggerer_job_runner.py:
##########
@@ -1179,30 +1210,36 @@ async def run_trigger(self, trigger_id: int, trigger:
BaseTrigger, timeout_after
name = self.triggers[trigger_id]["name"]
self.log.info("trigger %s starting", name)
- try:
- async for event in trigger.run():
- await self.log.ainfo(
- "Trigger fired event",
name=self.triggers[trigger_id]["name"], result=event
- )
- self.triggers[trigger_id]["events"] += 1
- self.events.append((trigger_id, event))
- except asyncio.CancelledError:
- # We get cancelled by the scheduler changing the task state. But
if we do lets give a nice error
- # message about it
- if timeout := timeout_after:
- timeout = timeout.replace(tzinfo=timezone.utc) if not
timeout.tzinfo else timeout
- if timeout < timezone.utcnow():
- await self.log.aerror("Trigger cancelled due to timeout")
- raise
- finally:
- # CancelledError will get injected when we're stopped - which is
- # fine, the cleanup process will understand that, but we want to
- # allow triggers a chance to cleanup, either in that case or if
- # they exit cleanly. Exception from cleanup methods are ignored.
- with suppress(Exception):
- await trigger.cleanup()
-
- await self.log.ainfo("trigger completed", name=name)
+ with _make_trigger_span(ti=trigger.task_instance,
trigger_id=trigger_id, name=name) as span:
+ try:
+ async for event in trigger.run():
+ await self.log.ainfo(
+ "Trigger fired event",
name=self.triggers[trigger_id]["name"], result=event
+ )
+ self.triggers[trigger_id]["events"] += 1
+ self.events.append((trigger_id, event))
+ span.set_status(Status(StatusCode.OK))
+ except asyncio.CancelledError as e:
+ # We get cancelled by the scheduler changing the task state.
But if we do lets give a nice error
+ # message about it
+ if timeout := timeout_after:
+ timeout = timeout.replace(tzinfo=timezone.utc) if not
timeout.tzinfo else timeout
+ if timeout < timezone.utcnow():
+ await self.log.aerror("Trigger cancelled due to
timeout")
+ span.set_status(Status(StatusCode.ERROR),
description=str(e))
Review Comment:
notable that it's applying timeout logic in two places here. as opposed to
say, inferring from the exc or something that it was canceled due to timeout.
minor minor kludge.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
