Add handle for circular exceptions in SecretsMasker.#61254
Closed
Crowiant wants to merge 1 commit intoapache:v2-11-testfrom
Closed
Add handle for circular exceptions in SecretsMasker.#61254Crowiant wants to merge 1 commit intoapache:v2-11-testfrom
Crowiant wants to merge 1 commit intoapache:v2-11-testfrom
Conversation
385d91b to
3520fbb
Compare
potiuk
added a commit
to potiuk/airflow
that referenced
this pull request
Feb 11, 2026
Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Initially implemented as a fix to v2-11-test in apache#61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed.
1 task
potiuk
added a commit
to potiuk/airflow
that referenced
this pull request
Feb 11, 2026
Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Initially implemented as a fix to v2-11-test in apache#61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com>
potiuk
added a commit
to potiuk/airflow
that referenced
this pull request
Feb 11, 2026
Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in apache#61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com>
Member
|
I am closing it in favour of #61776. Since it is also present in main, I recreated it there, and will backport it to both v3-1-test and v2-11-test, I also added test coverage, but also updated that change (result of testing) - rather than stopping redacting when recursion level is reached, we will SKIP those exceptions and replace the remaining stack trace with sentinel exception explaining that this happened. This is much safer, because potentially we could leak some secrets in those unredacted exceptions remaining on stack trace. |
potiuk
added a commit
to potiuk/airflow
that referenced
this pull request
Feb 11, 2026
Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in apache#61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com>
potiuk
added a commit
that referenced
this pull request
Feb 12, 2026
* Fix recursion depth error in _redact_exception_with_context Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in #61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Anton Nitochkin <nitochkin@google.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
github-actions bot
pushed a commit
that referenced
this pull request
Feb 12, 2026
…xt (#61776) * Fix recursion depth error in _redact_exception_with_context Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in #61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- (cherry picked from commit 1533ecf) Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Anton Nitochkin <nitochkin@google.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
potiuk
added a commit
to potiuk/airflow
that referenced
this pull request
Feb 12, 2026
There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in apache#61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com>
1 task
potiuk
added a commit
to potiuk/airflow
that referenced
this pull request
Feb 12, 2026
There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in apache#61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com> (cherry picked from commit (1533ecf)
Member
|
Cherry-picked to 2-11-test in #61797 |
github-actions bot
pushed a commit
to aws-mwaa/upstream-to-airflow
that referenced
this pull request
Feb 12, 2026
…xt (apache#61776) * Fix recursion depth error in _redact_exception_with_context Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in apache#61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- (cherry picked from commit 1533ecf) Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Anton Nitochkin <nitochkin@google.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
ytoprakc
pushed a commit
to ytoprakc/airflow
that referenced
this pull request
Feb 12, 2026
…1776) * Fix recursion depth error in _redact_exception_with_context Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in apache#61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Anton Nitochkin <nitochkin@google.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
potiuk
added a commit
that referenced
this pull request
Feb 12, 2026
There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in #61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com> (cherry picked from commit (1533ecf)
Ratasa143
pushed a commit
to Ratasa143/airflow
that referenced
this pull request
Feb 15, 2026
…1776) * Fix recursion depth error in _redact_exception_with_context Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in apache#61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Anton Nitochkin <nitochkin@google.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
potiuk
added a commit
that referenced
this pull request
Feb 15, 2026
…xt (#61776) * Fix recursion depth error in _redact_exception_with_context Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in #61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- (cherry picked from commit 1533ecf) Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Anton Nitochkin <nitochkin@google.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
potiuk
added a commit
that referenced
this pull request
Feb 15, 2026
…xt (#61776) (#61795) * Fix recursion depth error in _redact_exception_with_context Fix recursion depth check in _redact_exception_with_context_or_cause. There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in #61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. * Apply suggestions from code review --------- (cherry picked from commit 1533ecf) Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: Anton Nitochkin <nitochkin@google.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
potiuk
added a commit
that referenced
this pull request
Feb 16, 2026
There are some obscure cases where exception might point to itself in cause/context - this PR protects against it. Changed name to include cause as well. Initially implemented as a fix to v2-11-test in #61254 - enhanced with the case of removal of too-deep exceptions rather than not-redacting it (and replacing it with sentinel exception explaining that reminder of the stack trace has been removed. Co-authored-by: Anton Nitochkin <nitochkin@google.com> (cherry picked from commit (1533ecf)
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
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.
In the case of circular exceptions, Airflow 2 runs into a retry cycle without showing anything inside the task logs.
Here is the example that I used to reproduce the issue:
These changes will prevent this and show all exceptions to the user.
Was generative AI tooling used to co-author this PR?
{pr_number}.significant.rstor{issue_number}.significant.rst, in airflow-core/newsfragments.