Fix infinite recursion on redact log #20039
Merged
Conversation
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
potiuk
force-pushed
the
fix-infinite-recursion-in-redact
branch
3 times, most recently
from
cd1464a to
8e03c8e
Compare
uranusjr
reviewed
Dec 5, 2021
potiuk
force-pushed
the
fix-infinite-recursion-in-redact
branch
2 times, most recently
from
82a2aec to
933c0b1
Compare
Member
Author
|
Ok. That one should be ready to merge - the only failing test is another test_scheduler_job flakiness that is already addressed in #19860 |
When redact warning log on "unredactable" item is printed, the log entered an infinite recursion, because the item was attempted to be redacted again in the log. This PR converts the item to str() - in the worst case the str converstion will fail and raise exception - but this will be about right - but it will not attempt to redact the item again. Fixes: apache#19816
potiuk
force-pushed
the
fix-infinite-recursion-in-redact
branch
from
933c0b1 to
91a30f1
Compare
Member
Author
|
Shalll we ? |
uranusjr
reviewed
Dec 7, 2021
Co-authored-by: Tzu-ping Chung <uranusjr@gmail.com>
ashb
approved these changes
Dec 7, 2021
|
The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest main at your convenience, or amend the last commit of the PR, and push it with --force-with-lease. |
github-actions
bot
added
the
full tests needed
kaxil
approved these changes
Dec 7, 2021
jedcunningham
pushed a commit
that referenced
this pull request
Dec 7, 2021
* Fix infinite recursion on redact log When redact warning log on "unredactable" item is printed, the log entered an infinite recursion, because the item was attempted to be redacted again in the log. This PR converts the item to str() - in the worst case the str converstion will fail and raise exception - but this will be about right - but it will not attempt to redact the item again. Fixes: #19816 * Update airflow/utils/log/secrets_masker.py (cherry picked from commit f441833)
38 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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 redact warning log on "unredactable" item is printed, the
log entered an infinite recursion, because the item was attempted
to be redacted again in the log.
This PR converts the item to str() - in the worst case the str
converstion will fail and raise exception - but this will be about
right - but it will not attempt to redact the item again.
Fixes: #19816
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.