Skip to content

Fix provider-FAB SQLAlchemy session can't close automatically #58196

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
potiuk merged 2 commits into from
Nov 12, 2025
+8 −3
Merged

Fix provider-FAB SQLAlchemy session can't close automatically #58196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6054082
Fix duplicated SQLAlchemy sessions caused transactions fail to close
menghot Nov 11, 2025
8e3f89d
Merge branch 'main' into 57470/fix-provides-fab-sqlalchemy-session-no…
menghot Nov 11, 2025
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
9 changes: 7 additions & 2 deletions providers/fab/src/airflow/providers/fab/www/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from airflow.configuration import conf
from airflow.exceptions import AirflowConfigException
from airflow.logging_config import configure_logging
from airflow.providers.fab.www.extensions.init_appbuilder import init_appbuilder
from airflow.providers.fab.www.extensions.init_appbuilder import AirflowAppBuilder
from airflow.providers.fab.www.extensions.init_jinja_globals import init_jinja_globals
from airflow.providers.fab.www.extensions.init_manifest_files import configure_manifest_files
from airflow.providers.fab.www.extensions.init_security import init_api_auth
Expand Down Expand Up @@ -94,7 +94,12 @@ def create_app(enable_plugins: bool):
init_api_auth(flask_app)

with flask_app.app_context():
init_appbuilder(flask_app, enable_plugins=enable_plugins)
AirflowAppBuilder(
app=flask_app,
session=db.session,
base_template="airflow/main.html",
enable_plugins=enable_plugins,
)
init_error_handlers(flask_app)
# In two scenarios a Flask application can be created:
# - To support Airflow 2 plugins relying on Flask (``enable_plugins`` is True)
Expand Down
2 changes: 1 addition & 1 deletion providers/fab/www-hash.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c45890ac6b17386adfb076a4baec17589a26aab189d6257a92138aaa720fbc7f
cc109e95a25c1bb018a85a6a40859234398d5a9ac5bf317197eed3e3ece64b0d
Loading