Skip to content

Handle supervisor remote log upload failures gracefully#65308

Merged
ephraimbuddy merged 3 commits into
apache:mainfrom
astronomer:guard-log-upload
Apr 15, 2026
Merged

Handle supervisor remote log upload failures gracefully#65308
ephraimbuddy merged 3 commits into
apache:mainfrom
astronomer:guard-log-upload

Conversation

@ephraimbuddy
Copy link
Copy Markdown
Contributor

Prevent remote log upload errors from crashing task supervisor shutdown. Catch upload exceptions in the supervisor, log the failure with task context, and keep task completion behavior intact.

Prevent remote log upload errors from crashing task supervisor shutdown.
Catch upload exceptions in the supervisor, log the failure with task
context, and keep task completion behavior intact.
@ephraimbuddy ephraimbuddy added backport-to-v3-2-test Mark PR with this label to backport to v3-2-test branch and removed area:task-sdk labels Apr 15, 2026
Copy link
Copy Markdown
Contributor

@amoghrajesh amoghrajesh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks!

Comment thread task-sdk/src/airflow/sdk/execution_time/supervisor.py Outdated
Copy link
Copy Markdown
Member

@jason810496 jason810496 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice improvement.

@vatsrahul1001 vatsrahul1001 added this to the Airflow 3.2.2 milestone Apr 15, 2026
@ephraimbuddy ephraimbuddy merged commit 6f1c97b into apache:main Apr 15, 2026
111 checks passed
@ephraimbuddy ephraimbuddy deleted the guard-log-upload branch April 15, 2026 14:04
github-actions Bot pushed a commit that referenced this pull request Apr 15, 2026
…65308)

* Handle supervisor remote log upload failures gracefully

Prevent remote log upload errors from crashing task supervisor shutdown.
Catch upload exceptions in the supervisor, log the failure with task
context, and keep task completion behavior intact.

* Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

* fixup! Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

---------
(cherry picked from commit 6f1c97b)

Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>
@github-actions
Copy link
Copy Markdown
Contributor

Backport successfully created: v3-2-test

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status Branch Result
v3-2-test PR Link

vatsrahul1001 pushed a commit that referenced this pull request Apr 16, 2026
…65308)

* Handle supervisor remote log upload failures gracefully

Prevent remote log upload errors from crashing task supervisor shutdown.
Catch upload exceptions in the supervisor, log the failure with task
context, and keep task completion behavior intact.

* Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

* fixup! Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

---------
(cherry picked from commit 6f1c97b)

Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>
karenbraganz pushed a commit to karenbraganz/airflow that referenced this pull request Apr 16, 2026
* Handle supervisor remote log upload failures gracefully

Prevent remote log upload errors from crashing task supervisor shutdown.
Catch upload exceptions in the supervisor, log the failure with task
context, and keep task completion behavior intact.

* Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

* fixup! Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

---------

Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>
vatsrahul1001 pushed a commit that referenced this pull request Apr 23, 2026
…65308)

* Handle supervisor remote log upload failures gracefully

Prevent remote log upload errors from crashing task supervisor shutdown.
Catch upload exceptions in the supervisor, log the failure with task
context, and keep task completion behavior intact.

* Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

* fixup! Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

---------
(cherry picked from commit 6f1c97b)

Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>
potiuk pushed a commit that referenced this pull request Apr 26, 2026
…65308)

* Handle supervisor remote log upload failures gracefully

Prevent remote log upload errors from crashing task supervisor shutdown.
Catch upload exceptions in the supervisor, log the failure with task
context, and keep task completion behavior intact.

* Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

* fixup! Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

---------
(cherry picked from commit 6f1c97b)

Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>
potiuk added a commit that referenced this pull request Apr 26, 2026
…65308) (#65318)

* [v3-2-test] Bump actions/github-script in the github-actions-updates group (#65150) (#65160)

Bumps the github-actions-updates group with 1 update: [actions/github-script](https://github.com/actions/github-script).

Updates `actions/github-script` from 8.0.0 to 9.0.0
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@ed59741...3a2844b)
(cherry picked from commit e5a047c)



---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [v3-2-test] Added breeze generate issue content for airflow-ctl (#65042) (#65241)

* Add breeze generate issue content for airflow-ctl

* add new command to doc
(cherry picked from commit b24538b)

Co-authored-by: Justin Pakzad <114518232+justinpakzad@users.noreply.github.com>

* [v3-2-test] Run release calendar verification on its own schedule (#65118) (#65242)

* Move release calendar verification to its own scheduled workflow

Run dev/verify_release_calendar.py from a dedicated daily scheduled
workflow instead of as a canary job in the main CI pipeline, and
notify the #release-management Slack channel when the check fails so
the issue is surfaced to release managers directly.

* Include wiki and calendar links in release calendar Slack alert
(cherry picked from commit 048e9a1)

* [v3-2-test] Bump actions/github-script in the github-actions-updates group (#65150) (#65160)

Bumps the github-actions-updates group with 1 update: [actions/github-script](https://github.com/actions/github-script).

Updates `actions/github-script` from 8.0.0 to 9.0.0
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@ed59741...3a2844b)
(cherry picked from commit e5a047c)



---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [v3-2-test] Added breeze generate issue content for airflow-ctl (#65042) (#65241)

* Add breeze generate issue content for airflow-ctl

* add new command to doc
(cherry picked from commit b24538b)

Co-authored-by: Justin Pakzad <114518232+justinpakzad@users.noreply.github.com>

* [v3-2-test] Run release calendar verification on its own schedule (#65118) (#65242)

* Move release calendar verification to its own scheduled workflow

Run dev/verify_release_calendar.py from a dedicated daily scheduled
workflow instead of as a canary job in the main CI pipeline, and
notify the #release-management Slack channel when the check fails so
the issue is surfaced to release managers directly.

* Include wiki and calendar links in release calendar Slack alert
(cherry picked from commit 048e9a1)

* [v3-2-test] Handle supervisor remote log upload failures gracefully (#65308)

* Handle supervisor remote log upload failures gracefully

Prevent remote log upload errors from crashing task supervisor shutdown.
Catch upload exceptions in the supervisor, log the failure with task
context, and keep task completion behavior intact.

* Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

* fixup! Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

---------
(cherry picked from commit 6f1c97b)

Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jarek Potiuk <jarek@potiuk.com>
Co-authored-by: Justin Pakzad <114518232+justinpakzad@users.noreply.github.com>
Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>
vatsrahul1001 pushed a commit that referenced this pull request Apr 27, 2026
…65308) (#65318)

* [v3-2-test] Bump actions/github-script in the github-actions-updates group (#65150) (#65160)

Bumps the github-actions-updates group with 1 update: [actions/github-script](https://github.com/actions/github-script).

Updates `actions/github-script` from 8.0.0 to 9.0.0
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@ed59741...3a2844b)
(cherry picked from commit e5a047c)



---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [v3-2-test] Added breeze generate issue content for airflow-ctl (#65042) (#65241)

* Add breeze generate issue content for airflow-ctl

* add new command to doc
(cherry picked from commit b24538b)

Co-authored-by: Justin Pakzad <114518232+justinpakzad@users.noreply.github.com>

* [v3-2-test] Run release calendar verification on its own schedule (#65118) (#65242)

* Move release calendar verification to its own scheduled workflow

Run dev/verify_release_calendar.py from a dedicated daily scheduled
workflow instead of as a canary job in the main CI pipeline, and
notify the #release-management Slack channel when the check fails so
the issue is surfaced to release managers directly.

* Include wiki and calendar links in release calendar Slack alert
(cherry picked from commit 048e9a1)

* [v3-2-test] Bump actions/github-script in the github-actions-updates group (#65150) (#65160)

Bumps the github-actions-updates group with 1 update: [actions/github-script](https://github.com/actions/github-script).

Updates `actions/github-script` from 8.0.0 to 9.0.0
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@ed59741...3a2844b)
(cherry picked from commit e5a047c)



---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [v3-2-test] Added breeze generate issue content for airflow-ctl (#65042) (#65241)

* Add breeze generate issue content for airflow-ctl

* add new command to doc
(cherry picked from commit b24538b)

Co-authored-by: Justin Pakzad <114518232+justinpakzad@users.noreply.github.com>

* [v3-2-test] Run release calendar verification on its own schedule (#65118) (#65242)

* Move release calendar verification to its own scheduled workflow

Run dev/verify_release_calendar.py from a dedicated daily scheduled
workflow instead of as a canary job in the main CI pipeline, and
notify the #release-management Slack channel when the check fails so
the issue is surfaced to release managers directly.

* Include wiki and calendar links in release calendar Slack alert
(cherry picked from commit 048e9a1)

* [v3-2-test] Handle supervisor remote log upload failures gracefully (#65308)

* Handle supervisor remote log upload failures gracefully

Prevent remote log upload errors from crashing task supervisor shutdown.
Catch upload exceptions in the supervisor, log the failure with task
context, and keep task completion behavior intact.

* Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

* fixup! Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

---------
(cherry picked from commit 6f1c97b)

Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jarek Potiuk <jarek@potiuk.com>
Co-authored-by: Justin Pakzad <114518232+justinpakzad@users.noreply.github.com>
Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>
vatsrahul1001 pushed a commit that referenced this pull request May 20, 2026
…65308) (#65318)

* [v3-2-test] Bump actions/github-script in the github-actions-updates group (#65150) (#65160)

Bumps the github-actions-updates group with 1 update: [actions/github-script](https://github.com/actions/github-script).

Updates `actions/github-script` from 8.0.0 to 9.0.0
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@ed59741...3a2844b)
(cherry picked from commit e5a047c)



---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [v3-2-test] Added breeze generate issue content for airflow-ctl (#65042) (#65241)

* Add breeze generate issue content for airflow-ctl

* add new command to doc
(cherry picked from commit b24538b)

Co-authored-by: Justin Pakzad <114518232+justinpakzad@users.noreply.github.com>

* [v3-2-test] Run release calendar verification on its own schedule (#65118) (#65242)

* Move release calendar verification to its own scheduled workflow

Run dev/verify_release_calendar.py from a dedicated daily scheduled
workflow instead of as a canary job in the main CI pipeline, and
notify the #release-management Slack channel when the check fails so
the issue is surfaced to release managers directly.

* Include wiki and calendar links in release calendar Slack alert
(cherry picked from commit 048e9a1)

* [v3-2-test] Bump actions/github-script in the github-actions-updates group (#65150) (#65160)

Bumps the github-actions-updates group with 1 update: [actions/github-script](https://github.com/actions/github-script).

Updates `actions/github-script` from 8.0.0 to 9.0.0
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@ed59741...3a2844b)
(cherry picked from commit e5a047c)



---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 9.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [v3-2-test] Added breeze generate issue content for airflow-ctl (#65042) (#65241)

* Add breeze generate issue content for airflow-ctl

* add new command to doc
(cherry picked from commit b24538b)

Co-authored-by: Justin Pakzad <114518232+justinpakzad@users.noreply.github.com>

* [v3-2-test] Run release calendar verification on its own schedule (#65118) (#65242)

* Move release calendar verification to its own scheduled workflow

Run dev/verify_release_calendar.py from a dedicated daily scheduled
workflow instead of as a canary job in the main CI pipeline, and
notify the #release-management Slack channel when the check fails so
the issue is surfaced to release managers directly.

* Include wiki and calendar links in release calendar Slack alert
(cherry picked from commit 048e9a1)

* [v3-2-test] Handle supervisor remote log upload failures gracefully (#65308)

* Handle supervisor remote log upload failures gracefully

Prevent remote log upload errors from crashing task supervisor shutdown.
Catch upload exceptions in the supervisor, log the failure with task
context, and keep task completion behavior intact.

* Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

* fixup! Update task-sdk/src/airflow/sdk/execution_time/supervisor.py

---------
(cherry picked from commit 6f1c97b)

Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jarek Potiuk <jarek@potiuk.com>
Co-authored-by: Justin Pakzad <114518232+justinpakzad@users.noreply.github.com>
Co-authored-by: Ephraim Anierobi <splendidzigy24@gmail.com>
Co-authored-by: Ash Berlin-Taylor <ash_github@firemirror.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-to-v3-2-test Mark PR with this label to backport to v3-2-test branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants