You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "MonsterChenzhuo (via GitHub)" <gi...@apache.org> on 2026/02/28 06:18:12 UTC
[PR] Refactor DagProcessorManager._collect_results to use explicit session [airflow]
MonsterChenzhuo opened a new pull request, #62608:
URL: https://github.com/apache/airflow/pull/62608
<!-- SPDX-License-Identifier: Apache-2.0
https://www.apache.org/licenses/LICENSE-2.0 -->
This PR addresses a TODO in DagProcessorManager._collect_results by replacing the implicit @provide_session decorator with an explicit create_session context manager. This change improves the clarity of database transaction boundaries during the collection of DAG parsing results.
<!--
Thank you for contributing!
Please provide above a brief description of the changes made in this pull request.
Write a good git commit message following this guide: http://chris.beams.io/posts/git-commit/
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 (in general) for the review if you do not see reaction for a few days
(72 Hours is the minimum reaction time you can expect from volunteers) - we sometimes miss notifications.
In case of an existing issue, reference it using one of the following:
* closes: #ISSUE
* related: #ISSUE
-->
---
##### Was generative AI tooling used to co-author this PR?
<!--
If generative AI tooling has been used in the process of authoring this PR, please
change below checkbox to `[X]` followed by the name of the tool, uncomment the "Generated-by".
-->
- [ ] Yes (please specify the tool below)
<!--
Generated-by: [Tool Name] following [the guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
-->
---
* Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
* For fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
* When adding dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
* For significant user-facing changes create newsfragment: `{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] Refactor DagProcessorManager._collect_results to use explicit session [airflow]
Posted by "SameerMesiah97 (via GitHub)" <gi...@apache.org>.
SameerMesiah97 commented on code in PR #62608:
URL: https://github.com/apache/airflow/pull/62608#discussion_r2868113901
##########
airflow-core/tests/unit/dag_processing/test_manager_session.py:
##########
@@ -0,0 +1,57 @@
+# 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.
+
+# airflow-core/tests/unit/dag_processing/test_manager_session.py
+from __future__ import annotations
+
+from unittest import mock
+from unittest.mock import MagicMock
+
+from airflow.dag_processing.manager import DagFileInfo, DagFileProcessorManager
+
+
+class TestDagFileProcessorManagerSession:
Review Comment:
Why did you create a new file and a new class just for this specific test? Why not put this under the existing class in `test_manager.py`?
##########
airflow-core/tests/unit/dag_processing/test_manager_session.py:
##########
@@ -0,0 +1,57 @@
+# 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.
+
+# airflow-core/tests/unit/dag_processing/test_manager_session.py
+from __future__ import annotations
+
+from unittest import mock
+from unittest.mock import MagicMock
+
+from airflow.dag_processing.manager import DagFileInfo, DagFileProcessorManager
+
+
+class TestDagFileProcessorManagerSession:
+ @mock.patch("airflow.dag_processing.manager.create_session")
+ @mock.patch("airflow.dag_processing.manager.process_parse_results")
+ def test_collect_results_uses_explicit_session(self, mock_process_parse_results, mock_create_session):
+ manager = DagFileProcessorManager(max_runs=1)
+
+ # Mock session
+ mock_session = MagicMock()
+ mock_create_session.return_value.__enter__.return_value = mock_session
+
+ # Mock processors
+ mock_proc = MagicMock()
+ mock_proc.is_ready = True
+ mock_proc.parsing_result = MagicMock()
+
+ dag_file = DagFileInfo(bundle_name="testing", rel_path="dag.py", bundle_path="/tmp")
+
+ manager._processors = {dag_file: mock_proc}
+ manager._file_stats = {dag_file: MagicMock()}
+ manager._bundle_versions = {"testing": "1.0"}
+
+ # Call _collect_results
+ manager._collect_results()
+
+ # Verify create_session was called
+ mock_create_session.assert_called_once()
+
+ # Check if process_parse_results was called with the session from create_session
+ assert mock_process_parse_results.called
+ call_args = mock_process_parse_results.call_args
+ assert call_args.kwargs["session"] == mock_session
Review Comment:
Replace lines 55-57 with this:
```
_, kwargs = mock_process_parse_results.call_args
assert kwargs["session"] is mock_session
```
We need to assert identity. Not equality. The session should be the same object.
##########
airflow-core/tests/unit/dag_processing/test_manager_session.py:
##########
@@ -0,0 +1,57 @@
+# 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.
+
+# airflow-core/tests/unit/dag_processing/test_manager_session.py
+from __future__ import annotations
+
+from unittest import mock
+from unittest.mock import MagicMock
+
+from airflow.dag_processing.manager import DagFileInfo, DagFileProcessorManager
+
+
+class TestDagFileProcessorManagerSession:
+ @mock.patch("airflow.dag_processing.manager.create_session")
+ @mock.patch("airflow.dag_processing.manager.process_parse_results")
+ def test_collect_results_uses_explicit_session(self, mock_process_parse_results, mock_create_session):
+ manager = DagFileProcessorManager(max_runs=1)
+
+ # Mock session
+ mock_session = MagicMock()
+ mock_create_session.return_value.__enter__.return_value = mock_session
+
+ # Mock processors
+ mock_proc = MagicMock()
+ mock_proc.is_ready = True
+ mock_proc.parsing_result = MagicMock()
+
+ dag_file = DagFileInfo(bundle_name="testing", rel_path="dag.py", bundle_path="/tmp")
+
+ manager._processors = {dag_file: mock_proc}
+ manager._file_stats = {dag_file: MagicMock()}
+ manager._bundle_versions = {"testing": "1.0"}
+
+ # Call _collect_results
+ manager._collect_results()
+
+ # Verify create_session was called
+ mock_create_session.assert_called_once()
+
Review Comment:
Can you assert that the context manager was entered and exited as well? That is one of the invariants you have introduced.
--
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] Refactor DagProcessorManager._collect_results to use explicit session [airflow]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] closed pull request #62608: Refactor DagProcessorManager._collect_results to use explicit session
URL: https://github.com/apache/airflow/pull/62608
--
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] Refactor DagProcessorManager._collect_results to use explicit session [airflow]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #62608:
URL: https://github.com/apache/airflow/pull/62608#issuecomment-4256575974
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed in 5 days if no further activity occurs. Thank you for your contributions.
--
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