Skip to content

Correct the retry_db_transaction docstring about provide_session - #71311

Closed
1fanwang wants to merge 1 commit into
apache:mainfrom
1fanwang:retry-decorator-docstring
Closed

1fanwang wants to merge 1 commit into
apache:mainfrom
1fanwang:retry-decorator-docstring

Conversation

@1fanwang

@1fanwang 1fanwang commented Aug 7, 2026 •

Copy link
Copy Markdown
Contributor

Contributors following the database-retry documentation are told not to combine retries with automatic session creation. Existing callers already use that combination successfully; reversing the decorator order is what fails.

The docstring now shows provide_session outside retry_db_transaction. The retry wrapper needs a bound session so it can roll back failed attempts. This changes guidance only, not runtime behavior.

Testing

Executed both orders against the PR's Airflow source and a real SQLite session. The documented order queries and returns 7; the opposite order raises the existing TypeError. No migration or test data is needed.

Runnable example and raw output

From the repository root:

export AIRFLOW_HOME="$PWD/airflow-home"
export AIRFLOW__DATABASE__SQL_ALCHEMY_CONN="sqlite:///$AIRFLOW_HOME/airflow.db"
export AIRFLOW__CORE__LOAD_EXAMPLES=False
uv run --project airflow-core --no-dev python - <<'PY'
from sqlalchemy import text
from sqlalchemy.orm import Session
from airflow.utils.retries import retry_db_transaction
from airflow.utils.session import NEW_SESSION, provide_session

@provide_session
@retry_db_transaction
def provide_session_outer(value: int, *, session: Session = NEW_SESSION) -> int:
    return session.scalar(text("SELECT :v"), {"v": value})

@retry_db_transaction
@provide_session
def retry_outer(value: int, *, session: Session = NEW_SESSION) -> int:
    return session.scalar(text("SELECT :v"), {"v": value})

print(f"provide_session outer: {provide_session_outer(7)}")
try:
    retry_outer(7)
except TypeError as error:
    print(f"retry outer: {type(error).__name__}: {error}")
PY
provide_session outer: 7
retry outer: TypeError: session is a required argument for retry_outer

Was generative AI tooling used to co-author this PR?
  • Yes (please specify the tool below)

Generated-by: GitHub Copilot CLI (GPT-6 Astra) following the guidelines

The docstring says the decorator should not be used with @provide_session,
but three call sites in airflow-core stack the two, and the combination is
the only way to retry a read that needs a session created for it.

The real constraint is ordering. The retry wrapper looks up the session when
it runs, so it has to sit inside @provide_session; the opposite order raises
TypeError because no session exists yet.

Signed-off-by: 1fanwang <[email protected]>
@potiuk potiuk added the ready for maintainer review Set by triage when all criteria pass, or by the fork CI reconciler when fork CI is green. label Aug 13, 2026
@uros-b

uros-b commented Aug 19, 2026

Copy link
Copy Markdown
Member

LGTM

@potiuk

potiuk commented Sep 25, 2026

Copy link
Copy Markdown
Member

Hello @1fanwang - thank you for your contributions to Apache Airflow!

The Airflow community has introduced a limit of 5 open pull requests at a time for contributors without write access to the repository. You currently have 34 open pull requests, so - as a one-time step of introducing the limit - we closed the ones where maintainers have not engaged yet:

These pull requests stay open because maintainers are already engaged in them - they count towards your limit:

This is not a judgement of you or of your changes. We never told contributors before that opening many pull requests at once was a problem, so there is nothing to feel bad about - and nothing is lost: your branches, commits and the review history stay where they are.

What we ask you to do is to make your first prioritization decision: choose which of the pull requests above matter most to you, and reopen them (up to 5 open at a time, including the ones still open) with the "Reopen pull request" button or gh pr reopen <PR_NUMBER> --repo apache/airflow. Reopen the ones you are ready to follow through - keep them rebased, respond to review comments and fix failing checks.

While your pull requests are waiting for review, the most valuable thing you can do is help in other ways - reviewing other contributors' pull requests, helping with issues, and taking part in the discussions on the devlist and Slack.

Why we introduced the limit, what it means for you and how to reopen or restore a pull request is explained in https://github.com/apache/airflow/blob/main/contributing-docs/32_open_pull_request_limit.rst.


Drafted-by: Claude Code (Opus 5); reviewed by @potiuk before posting

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

closed because of open PR limit Closed as a one-time step of introducing the open pull request limit ready for maintainer review Set by triage when all criteria pass, or by the fork CI reconciler when fork CI is green.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants