You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "kaxil (via GitHub)" <gi...@apache.org> on 2025/05/11 00:11:29 UTC
[PR] Ensure singleton use of `DagBag` across all API requests [airflow]
kaxil opened a new pull request, #50447:
URL: https://github.com/apache/airflow/pull/50447
Previously, DagBag was injected via onlyFastAPI dependency as part of the refactor in https://github.com/apache/airflow/pull/50372, but a new instance was created for each request. This change updates the dependency to resolve DagBag from `app.state`, ensuring it is only instantiated once at startup while keeping benefits of FastAPI dependency.
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of an existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
<!-- Please keep an empty line above the dashes. -->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Ensure singleton use of `DagBag` across all API requests [airflow]
Posted by "kaxil (via GitHub)" <gi...@apache.org>.
kaxil commented on code in PR #50447:
URL: https://github.com/apache/airflow/pull/50447#discussion_r2083475599
##########
airflow-core/src/airflow/api_fastapi/common/dagbag.py:
##########
@@ -14,22 +14,32 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
from __future__ import annotations
import os
from typing import Annotated
-from fastapi import Depends
+from fastapi import Depends, Request
from airflow.models.dagbag import DagBag
from airflow.settings import DAGS_FOLDER
-def _get_dag_bag() -> DagBag:
+def get_dag_bag() -> DagBag:
+ """Instantiate the appropriate DagBag based on the ``SKIP_DAGS_PARSING`` environment variable."""
if os.environ.get("SKIP_DAGS_PARSING") == "True":
return DagBag(os.devnull, include_examples=False)
return DagBag(DAGS_FOLDER, read_dags_from_db=True)
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Ensure singleton use of `DagBag` across all API requests [airflow]
Posted by "ashb (via GitHub)" <gi...@apache.org>.
ashb commented on code in PR #50447:
URL: https://github.com/apache/airflow/pull/50447#discussion_r2083465079
##########
airflow-core/src/airflow/api_fastapi/common/dagbag.py:
##########
@@ -14,22 +14,32 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
from __future__ import annotations
import os
from typing import Annotated
-from fastapi import Depends
+from fastapi import Depends, Request
from airflow.models.dagbag import DagBag
from airflow.settings import DAGS_FOLDER
-def _get_dag_bag() -> DagBag:
+def get_dag_bag() -> DagBag:
+ """Instantiate the appropriate DagBag based on the ``SKIP_DAGS_PARSING`` environment variable."""
if os.environ.get("SKIP_DAGS_PARSING") == "True":
return DagBag(os.devnull, include_examples=False)
return DagBag(DAGS_FOLDER, read_dags_from_db=True)
Review Comment:
Waaaait. Webserver should never parse DAGs. What's going on here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Ensure singleton use of `DagBag` across all API requests [airflow]
Posted by "kaxil (via GitHub)" <gi...@apache.org>.
kaxil commented on code in PR #50447:
URL: https://github.com/apache/airflow/pull/50447#discussion_r2084106774
##########
airflow-core/src/airflow/api_fastapi/common/dagbag.py:
##########
@@ -14,22 +14,29 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
from __future__ import annotations
-import os
from typing import Annotated
-from fastapi import Depends
+from fastapi import Depends, Request
from airflow.models.dagbag import DagBag
from airflow.settings import DAGS_FOLDER
-def _get_dag_bag() -> DagBag:
- if os.environ.get("SKIP_DAGS_PARSING") == "True":
- return DagBag(os.devnull, include_examples=False)
+def get_dag_bag() -> DagBag:
Review Comment:
Yeah, what LIU said. Updated the func name for better clarity too
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Ensure singleton use of `DagBag` across all API requests [airflow]
Posted by "ashb (via GitHub)" <gi...@apache.org>.
ashb commented on code in PR #50447:
URL: https://github.com/apache/airflow/pull/50447#discussion_r2083844711
##########
airflow-core/src/airflow/api_fastapi/common/dagbag.py:
##########
@@ -14,22 +14,29 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
from __future__ import annotations
-import os
from typing import Annotated
-from fastapi import Depends
+from fastapi import Depends, Request
from airflow.models.dagbag import DagBag
from airflow.settings import DAGS_FOLDER
-def _get_dag_bag() -> DagBag:
- if os.environ.get("SKIP_DAGS_PARSING") == "True":
- return DagBag(os.devnull, include_examples=False)
+def get_dag_bag() -> DagBag:
Review Comment:
Where is this one used?
It's a bit confusing to have two funcs so similarly named they do very different.
It looks like one is only used in tests?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Ensure singleton use of `DagBag` across all API requests [airflow]
Posted by "kaxil (via GitHub)" <gi...@apache.org>.
kaxil merged PR #50447:
URL: https://github.com/apache/airflow/pull/50447
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Ensure singleton use of `DagBag` across all API requests [airflow]
Posted by "jason810496 (via GitHub)" <gi...@apache.org>.
jason810496 commented on code in PR #50447:
URL: https://github.com/apache/airflow/pull/50447#discussion_r2083873630
##########
airflow-core/src/airflow/api_fastapi/common/dagbag.py:
##########
@@ -14,22 +14,29 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
from __future__ import annotations
-import os
from typing import Annotated
-from fastapi import Depends
+from fastapi import Depends, Request
from airflow.models.dagbag import DagBag
from airflow.settings import DAGS_FOLDER
-def _get_dag_bag() -> DagBag:
- if os.environ.get("SKIP_DAGS_PARSING") == "True":
- return DagBag(os.devnull, include_examples=False)
+def get_dag_bag() -> DagBag:
Review Comment:
The public `get_dag_bag` is used in `app.py` to set the global app state, and the private `_get_dag_bag` is for FastAPI dependency injection.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Ensure singleton use of `DagBag` across all API requests [airflow]
Posted by "kaxil (via GitHub)" <gi...@apache.org>.
kaxil commented on code in PR #50447:
URL: https://github.com/apache/airflow/pull/50447#discussion_r2083475088
##########
airflow-core/src/airflow/api_fastapi/common/dagbag.py:
##########
@@ -14,22 +14,32 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
from __future__ import annotations
import os
from typing import Annotated
-from fastapi import Depends
+from fastapi import Depends, Request
from airflow.models.dagbag import DagBag
from airflow.settings import DAGS_FOLDER
-def _get_dag_bag() -> DagBag:
+def get_dag_bag() -> DagBag:
+ """Instantiate the appropriate DagBag based on the ``SKIP_DAGS_PARSING`` environment variable."""
if os.environ.get("SKIP_DAGS_PARSING") == "True":
return DagBag(os.devnull, include_examples=False)
return DagBag(DAGS_FOLDER, read_dags_from_db=True)
Review Comment:
Yeah, we don't parse dags in this function.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Ensure singleton use of `DagBag` across all API requests [airflow]
Posted by "rawwar (via GitHub)" <gi...@apache.org>.
rawwar commented on code in PR #50447:
URL: https://github.com/apache/airflow/pull/50447#discussion_r2083465727
##########
airflow-core/src/airflow/api_fastapi/common/dagbag.py:
##########
@@ -14,22 +14,32 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
from __future__ import annotations
import os
from typing import Annotated
-from fastapi import Depends
+from fastapi import Depends, Request
from airflow.models.dagbag import DagBag
from airflow.settings import DAGS_FOLDER
-def _get_dag_bag() -> DagBag:
+def get_dag_bag() -> DagBag:
+ """Instantiate the appropriate DagBag based on the ``SKIP_DAGS_PARSING`` environment variable."""
if os.environ.get("SKIP_DAGS_PARSING") == "True":
return DagBag(os.devnull, include_examples=False)
return DagBag(DAGS_FOLDER, read_dags_from_db=True)
Review Comment:
read_dags_from_db is set to True. So, its not actually parsing DAGs, right?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Ensure singleton use of `DagBag` across all API requests [airflow]
Posted by "kaxil (via GitHub)" <gi...@apache.org>.
kaxil commented on code in PR #50447:
URL: https://github.com/apache/airflow/pull/50447#discussion_r2083475448
##########
airflow-core/src/airflow/api_fastapi/common/dagbag.py:
##########
@@ -14,22 +14,32 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
from __future__ import annotations
import os
from typing import Annotated
-from fastapi import Depends
+from fastapi import Depends, Request
from airflow.models.dagbag import DagBag
from airflow.settings import DAGS_FOLDER
-def _get_dag_bag() -> DagBag:
+def get_dag_bag() -> DagBag:
+ """Instantiate the appropriate DagBag based on the ``SKIP_DAGS_PARSING`` environment variable."""
if os.environ.get("SKIP_DAGS_PARSING") == "True":
return DagBag(os.devnull, include_examples=False)
return DagBag(DAGS_FOLDER, read_dags_from_db=True)
Review Comment:
The `SKIP_DAGS_PARSING` is an artifact of old code, will nuke it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org