[v3-1-test] Fix deferrable sensors not respecting soft_fail on timeout (#61132)#61421
Merged
[v3-1-test] Fix deferrable sensors not respecting soft_fail on timeout (#61132)#61421
Conversation
#61132) When a deferrable sensor with soft_fail=True times out, the task fails with AirflowSensorTimeout instead of being marked as SKIPPED. This is a regression from Airflow 2.x behavior. The issue was in resume_execution() where TaskDeferralTimeout was converted to AirflowSensorTimeout before checking soft_fail. This fix uses nested exception handling to check soft_fail and never_fail before the conversion, ensuring timeouts are properly skipped. closes: #61130 (cherry picked from commit cec8ba6) Co-authored-by: Nathan Hadfield <nathan.hadfield@king.com> Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 task
kaxil
approved these changes
Feb 4, 2026
vatsrahul1001
pushed a commit
that referenced
this pull request
Mar 4, 2026
#61132) (#61421) When a deferrable sensor with soft_fail=True times out, the task fails with AirflowSensorTimeout instead of being marked as SKIPPED. This is a regression from Airflow 2.x behavior. The issue was in resume_execution() where TaskDeferralTimeout was converted to AirflowSensorTimeout before checking soft_fail. This fix uses nested exception handling to check soft_fail and never_fail before the conversion, ensuring timeouts are properly skipped. closes: #61130 (cherry picked from commit cec8ba6) Co-authored-by: Nathan Hadfield <nathan.hadfield@king.com> Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
81 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When a deferrable sensor with soft_fail=True times out, the task
fails with AirflowSensorTimeout instead of being marked as SKIPPED.
This is a regression from Airflow 2.x behavior.
The issue was in resume_execution() where TaskDeferralTimeout was
converted to AirflowSensorTimeout before checking soft_fail. This
fix uses nested exception handling to check soft_fail and never_fail
before the conversion, ensuring timeouts are properly skipped.
closes: #61130
(cherry picked from commit cec8ba6)
Co-authored-by: Nathan Hadfield nathan.hadfield@king.com
Co-Authored-By: Claude Sonnet 4.5 noreply@anthropic.com