dabla commented on code in PR #60152:
URL: https://github.com/apache/airflow/pull/60152#discussion_r2712646874
##########
airflow-core/src/airflow/jobs/triggerer_job_runner.py:
##########
@@ -1066,46 +1066,78 @@ async def cleanup_finished_triggers(self) -> list[int]:
await asyncio.sleep(0)
return finished_ids
- async def sync_state_to_supervisor(self, finished_ids: list[int]):
+ def process_trigger_events(self, finished_ids: list[int]) ->
messages.TriggerStateChanges:
# Copy out of our dequeues in threadsafe manner to sync state with
parent
- events_to_send = []
+ events_to_send: list[tuple[int, DiscrimatedTriggerEvent]] = []
+ failures_to_send: list[tuple[int, list[str] | None]] = []
+
while self.events:
- data = self.events.popleft()
- events_to_send.append(data)
+ trigger_id, trigger_event = self.events.popleft()
+ events_to_send.append((trigger_id, trigger_event))
- failures_to_send = []
while self.failed_triggers:
- id, exc = self.failed_triggers.popleft()
+ trigger_id, exc = self.failed_triggers.popleft()
tb = format_exception(type(exc), exc, exc.__traceback__) if exc
else None
- failures_to_send.append((id, tb))
+ failures_to_send.append((trigger_id, tb))
- msg = messages.TriggerStateChanges(
- events=events_to_send, finished=finished_ids,
failures=failures_to_send
+ return messages.TriggerStateChanges(
+ events=events_to_send if events_to_send else None,
+ finished=finished_ids if finished_ids else None,
+ failures=failures_to_send if failures_to_send else None,
)
- if not events_to_send:
- msg.events = None
+ def sanitize_trigger_events(self, msg: messages.TriggerStateChanges) ->
messages.TriggerStateChanges:
+ req_encoder = _new_encoder()
+ events_to_send: list[tuple[int, DiscrimatedTriggerEvent]] = []
+
+ if msg.events:
+ for trigger_id, trigger_event in msg.events:
+ try:
+ req_encoder.encode(trigger_event)
+ except Exception as e:
+ logger.error(
+ "Trigger %s returned non-serializable result %r.
Cancelling trigger.",
+ trigger_id,
+ trigger_event,
+ )
+ self.failed_triggers.append((trigger_id, e))
+ else:
+ events_to_send.append((trigger_id, trigger_event))
- if not failures_to_send:
- msg.failures = None
+ return messages.TriggerStateChanges(
+ events=events_to_send if events_to_send else None,
+ finished=msg.finished,
+ failures=msg.failures,
+ )
- if not finished_ids:
- msg.finished = None
+ async def sync_state_to_supervisor(self, finished_ids: list[int]) -> None:
+ msg = self.process_trigger_events(finished_ids=finished_ids)
# Tell the monitor that we've finished triggers so it can update things
try:
- resp = await self.comms_decoder.asend(msg)
+ resp = await self.asend(msg)
Review Comment:
I refactored it as agreed with @ashb , so I think we can merge it right?
--
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]
