Skip to content

fix: prevent early return in check_for_write_conflict loop #64062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jscheffl merged 2 commits into from
Mar 29, 2026
Merged

fix: prevent early return in check_for_write_conflict loop #64062

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e54c9c
fix: restore early return in check_for_write_conflict
Kundan-CR7 Mar 29, 2026
c2f4051
Merge branch 'main' into fix-variable-conflict-loop
Kundan-CR7 Mar 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions airflow-core/src/airflow/models/variable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,14 +480,14 @@ def check_for_write_conflict(key: str) -> None:
_backend_name,
_backend_name,
)
return
Comment thread
jscheffl marked this conversation as resolved.
return None
except Exception:
log.exception(
Comment thread
Kundan-CR7 marked this conversation as resolved.
"Unable to retrieve variable from secrets backend (%s). "
"Checking subsequent secrets backend.",
type(secrets_backend).__name__,
)
return None
return None

@staticmethod
def get_variable_from_secrets(key: str, team_name: str | None = None) -> str | None:
Expand Down
Loading