ashb commented on code in PR #60152:
URL: https://github.com/apache/airflow/pull/60152#discussion_r2687518331
##########
airflow-core/src/airflow/jobs/triggerer_job_runner.py:
##########
@@ -1059,46 +1059,62 @@ 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 validate_state_changes(self, finished_ids: list[int]) ->
messages.TriggerStateChanges:
# Copy out of our dequeues in threadsafe manner to sync state with
parent
- events_to_send = []
+
+ req_encoder = _new_encoder()
+ 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()
+
+ try:
+ req_encoder.encode(trigger_event)
+ events_to_send.append((trigger_id, trigger_event))
+ except NotImplementedError as e:
+ logger.error(
+ "Trigger %s returned non-serializable result %r.
Cancelling trigger.",
+ trigger_id,
+ trigger_event,
+ )
+ self.failed_triggers.append((trigger_id, e))
- 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
+ async def sync_state_to_supervisor(self, finished_ids: list[int]):
+ msg = self.validate_state_changes(finished_ids=finished_ids)
- if not failures_to_send:
- msg.failures = None
+ # Tell the monitor that we've finished triggers so it can update things
+ resp = await self.send_state_changes(msg)
- if not finished_ids:
- msg.finished = None
+ if resp:
+ self.to_create.extend(resp.to_create)
+ self.to_cancel.extend(resp.to_cancel)
- # Tell the monitor that we've finished triggers so it can update things
+ async def send_state_changes(self, msg: messages.TriggerStateChanges) ->
messages.TriggerStateSync | None:
try:
- resp = await self.comms_decoder.asend(msg)
+ response = await self.comms_decoder.asend(msg)
+
+ if not isinstance(response, messages.TriggerStateSync):
+ raise RuntimeError(f"Expected to get a TriggerStateSync
message, instead we got {type(msg)}")
Review Comment:
Is this ever possilbe?
--
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]
