vatsrahul1001 opened a new pull request, #67204: URL: https://github.com/apache/airflow/pull/67204
Manual backport of #66574 — auto-backport failed due to the `RetryTask` branch in supervisor's `_handle_request`. ## Conflict resolution `task-sdk/src/airflow/sdk/execution_time/supervisor.py` — one block under `elif isinstance(msg, RetryTask):`. v3-2-test still had the inline `self.client.task_instances.retry(id=..., end_date=..., rendered_map_index=...)` call. The PR's squash-merge bundled the "refactor terminal-state dispatch" reshape that replaces all four direct API calls (SucceedTask / RetryTask / DeferTask / RescheduleTask) with `self._send_terminal_state_msg(msg)`. The new `_send_terminal_state_msg` helper is included in this cherry-pick (defined at supervisor.py:1246 post-merge), so accepting the incoming side at the conflict is the correct resolution — it routes RetryTask through the same dispatcher the other three terminal states already use post-rebase. The test file (`test_supervisor.py`) auto-merged cleanly — the new parametrized `test_terminal_state_not_set_when_direct_api_fails` and `test_update_task_state_replays_pending_terminal_state_call` (across all four message types) landed as-is. ## Scope 2 files changed, +219 / −22 — exact mirror of #66574's merged diff. -- 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]
