Skip to content

Fix AWS Batch Executor compatibility with Airflow 3 in try_adopt_task_instances#68027

Merged
o-nikolas merged 3 commits into
apache:mainfrom
ambaena:fix/aws-batch-executor-adopt-airflow3
Jun 22, 2026
Merged

Fix AWS Batch Executor compatibility with Airflow 3 in try_adopt_task_instances#68027
o-nikolas merged 3 commits into
apache:mainfrom
ambaena:fix/aws-batch-executor-adopt-airflow3

Conversation

@ambaena

@ambaena ambaena commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Related: #62192

The AWS Batch Executor still calls TaskInstance.command_as_list() from try_adopt_task_instances(). That method is not available in Airflow 3 after the Task SDK changes.

This is triggered when the scheduler restarts or fails over and tries to adopt orphaned task instances that still have an external_executor_id pointing to an AWS Batch job. The scheduler calls adopt_or_reset_orphaned_tasks(), the Batch executor describes the existing Batch jobs, and then crashes while rebuilding the command for the adopted task instance:

AttributeError: TaskInstance object has no attribute command_as_list

The normal submission path already handles Task SDK workloads. This change makes the adoption path use the same Task SDK command serialization on Airflow 3 while keeping the existing command_as_list() behavior for Airflow 2.

This mirrors the ECS executor fix from #62192 for the AWS Batch executor.

Testing:

  • prek run --files providers/amazon/src/airflow/providers/amazon/aws/executors/batch/batch_executor.py providers/amazon/tests/unit/amazon/aws/executors/batch/test_batch_executor.py
  • uv run --project providers/amazon pytest providers/amazon/tests/unit/amazon/aws/executors/batch/test_batch_executor.py -k "try_adopt_task_instances or serialize_workload_to_command or build_task_command" -xvs

Disclosure: I used an AI assistant to help investigate the failure mode and cross-check the proposed fix. I reviewed the final code and tests myself.


Note

✅ Ready for review · @ambaena@potiuk · 2026-06-12 13:30 UTC

Thanks @ambaena — all checks are green and this PR is marked ready for maintainer review. The ball is with the maintainers now; a maintainer will take the next look.

Automated triage — may be imperfect.

@boring-cyborg boring-cyborg Bot added area:providers provider:amazon AWS/Amazon - related issues labels Jun 4, 2026
@boring-cyborg

boring-cyborg Bot commented Jun 4, 2026

Copy link
Copy Markdown

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contributors' Guide
Here are some useful points:

  • Pay attention to the quality of your code (ruff, mypy and type annotations). Our prek-hooks will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example Dag that shows how users should use it.
  • Consider using Breeze environment for testing locally, it's a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
  • Always keep your Pull Requests rebased, otherwise your build might fail due to changes not related to your commits.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@ambaena
ambaena marked this pull request as ready for review June 4, 2026 16:57
@ambaena
ambaena requested a review from o-nikolas as a code owner June 4, 2026 16:57
@ambaena

ambaena commented Jun 5, 2026

Copy link
Copy Markdown
Contributor Author

Fixed the test failure caused by Python 3.10 compatibility.

@potiuk potiuk added the ready for maintainer review Set after triaging when all criteria pass. label Jun 12, 2026
@o-nikolas
o-nikolas merged commit b788d83 into apache:main Jun 22, 2026
94 checks passed
@boring-cyborg

boring-cyborg Bot commented Jun 22, 2026

Copy link
Copy Markdown

Awesome work, congrats on your first merged pull request! You are invited to check our Issue Tracker for additional contributions.

cetingokhan pushed a commit to cetingokhan/airflow that referenced this pull request Jun 24, 2026
…xec (apache#68027)

Build either an Airflow 2 `airflow` CLI command or an Airflow 3 python execution of task execution with a json payload representing this task.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providers provider:amazon AWS/Amazon - related issues ready for maintainer review Set after triaging when all criteria pass.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants