Skip to content

Reconnect Cloud Batch jobs on task retry - #72420

Closed
1fanwang wants to merge 4 commits into
apache:mainfrom
1fanwang:fix-cloud-batch-retry
Closed

1fanwang wants to merge 4 commits into
apache:mainfrom
1fanwang:fix-cloud-batch-retry

Conversation

@1fanwang

@1fanwang 1fanwang commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

A synchronous Cloud Batch task uses a caller-stable job ID. If its worker exits after submission, retry resubmits the same ID and fails with 409 ... already exists, even if the first job is active or succeeded.

On Airflow 3.3+, the operator saves the canonical name before waiting. Retry fetches only that task-owned job: wait if active, restore success, resubmit after NotFound, or reject other terminal states. Fresh and deferrable execution, durable=False, and older Airflow behavior do not change.

Testing

The regression test drives the real task state accessor and execute() with a local hook stand-in.

Raw retry proof
$ AIRFLOW_HOME=.build/cloud-batch-proof-home uv run --project providers/google pytest providers/google/tests/unit/google/cloud/operators/test_cloud_batch.py::TestCloudBatchSubmitJobOperator::test_retry_reconnects_to_running_job -xvs

# upstream/main
E   google.api_core.exceptions.AlreadyExists: 409 Job projects/testproject/locations/us-central1/jobs/test already exists
=================== 1 failed, 1 warning in 113.59s (0:01:53) ===================

# this branch
PASSED
=================== 1 passed, 1 warning in 92.69s (0:01:32) ====================

Was generative AI tooling used to co-author this PR?
  • Yes (GitHub Copilot CLI, GPT-5.6 Sol)

Generated-by: GitHub Copilot CLI (GPT-5.6 Sol) following the guidelines


  • Read the Pull Request Guidelines for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
  • For fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
  • When adding dependency, check compliance with the ASF 3rd Party License Policy.
  • For significant user-facing changes create newsfragment: {pr_number}.significant.rst, in airflow-core/newsfragments. You can add this file in a follow-up commit after the PR is created so you know the PR number.

A synchronous Cloud Batch job can outlive its worker process. Retrying the task currently resubmits the caller-stable job name and fails with AlreadyExists instead of waiting for the job that task already started.

Generated-by: GitHub Copilot CLI (GPT-5.6 Sol)
Signed-off-by: 1fanwang <1fannnw@gmail.com>
The Google provider compatibility matrix includes Airflow versions from before task_state_store existed. Importing Airflow 3.3-only SDK types during collection would fail that matrix before the existing fallback path could run.

Generated-by: GitHub Copilot CLI (GPT-5.6 Sol)
Signed-off-by: 1fanwang <1fannnw@gmail.com>
Provider call sites should remain unambiguous, and regression mocks must reject unsupported hook calls so API drift cannot pass unnoticed.

Generated-by: GitHub Copilot CLI (GPT-5.6 Sol)
Signed-off-by: 1fanwang <1fannnw@gmail.com>
@boring-cyborg boring-cyborg Bot added area:providers provider:google Google (including GCP) related issues labels Sep 2, 2026
Supported google-cloud-batch versions expose newer cancellation wire values as raw integers. Retry recovery must preserve those states without requiring a newer client.

Generated-by: GitHub Copilot CLI (GPT-5.6 Sol)
Signed-off-by: 1fanwang <1fannnw@gmail.com>
@potiuk potiuk added the closed because of open PR limit Closed as a one-time step of introducing the open pull request limit label Sep 25, 2026
@potiuk

potiuk commented Sep 25, 2026

Copy link
Copy Markdown
Member

Hello @1fanwang - thank you for your contributions to Apache Airflow!

The Airflow community has introduced a limit of 5 open pull requests at a time for contributors without write access to the repository. You currently have 34 open pull requests, so - as a one-time step of introducing the limit - we closed the ones where maintainers have not engaged yet:

These pull requests stay open because maintainers are already engaged in them - they count towards your limit:

This is not a judgement of you or of your changes. We never told contributors before that opening many pull requests at once was a problem, so there is nothing to feel bad about - and nothing is lost: your branches, commits and the review history stay where they are.

What we ask you to do is to make your first prioritization decision: choose which of the pull requests above matter most to you, and reopen them (up to 5 open at a time, including the ones still open) with the "Reopen pull request" button or gh pr reopen <PR_NUMBER> --repo apache/airflow. Reopen the ones you are ready to follow through - keep them rebased, respond to review comments and fix failing checks.

While your pull requests are waiting for review, the most valuable thing you can do is help in other ways - reviewing other contributors' pull requests, helping with issues, and taking part in the discussions on the devlist and Slack.

Why we introduced the limit, what it means for you and how to reopen or restore a pull request is explained in https://github.com/apache/airflow/blob/main/contributing-docs/32_open_pull_request_limit.rst.


Drafted-by: Claude Code (Opus 5); reviewed by @potiuk before posting

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:providers closed because of open PR limit Closed as a one-time step of introducing the open pull request limit provider:google Google (including GCP) related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants