You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "dabla (via GitHub)" <gi...@apache.org> on 2026/07/03 10:06:10 UTC
[PR] Make sure stale file handler doesn't crash the DagFileProcessorManager [airflow]
dabla opened a new pull request, #69324:
URL: https://github.com/apache/airflow/pull/69324
<!-- SPDX-License-Identifier: Apache-2.0
https://www.apache.org/licenses/LICENSE-2.0 -->
<!--
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.
For user-facing UI changes, please attach before/after screenshots (or a short
screen recording) so reviewers can assess the visual impact.
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: [#69321](https://github.com/apache/airflow/issues/69321)
* related: [#69321](https://github.com/apache/airflow/issues/69321)
-->
As described in issue [#69321](https://github.com/apache/airflow/issues/69321), this PR makes sure a stale file handler doesn't crash the `DagFileProcessorManager`. The OSError should be catched and logged as warning instead.
---
##### 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`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments). You can add this file in a follow-up commit after the PR is created so you know the PR number.
--
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] Make sure stale file handler doesn't crash the DagFileProcessorManager [airflow]
Posted by "dabla (via GitHub)" <gi...@apache.org>.
dabla commented on code in PR #69324:
URL: https://github.com/apache/airflow/pull/69324#discussion_r3550652096
##########
airflow-core/tests/unit/dag_processing/test_manager.py:
##########
@@ -497,6 +497,21 @@ def test_terminate_orphan_processes_kills_processor_when_file_is_truly_absent(se
)
processor.kill.assert_called_once_with(signal.SIGKILL)
+ def test_terminate_orphan_processes_tolerates_stale_file_handle_on_close(self):
+ """A stale NFS file handle on close (e.g. OpenShift) must not crash the manager."""
+ manager = DagFileProcessorManager(max_runs=1)
+ versioned_file = _get_versioned_file_info("callbacks.py")
+ processor = MagicMock()
Review Comment:
Replace MagicMock with mock_processor.
##########
airflow-core/tests/unit/dag_processing/test_manager.py:
##########
@@ -497,6 +497,21 @@ def test_terminate_orphan_processes_kills_processor_when_file_is_truly_absent(se
)
processor.kill.assert_called_once_with(signal.SIGKILL)
+ def test_terminate_orphan_processes_tolerates_stale_file_handle_on_close(self):
+ """A stale NFS file handle on close (e.g. OpenShift) must not crash the manager."""
+ manager = DagFileProcessorManager(max_runs=1)
+ versioned_file = _get_versioned_file_info("callbacks.py")
+ processor = MagicMock()
Review Comment:
Replaced MagicMock with mock_processor.
--
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] Make sure stale file handler doesn't crash the DagFileProcessorManager [airflow]
Posted by "dabla (via GitHub)" <gi...@apache.org>.
dabla commented on code in PR #69324:
URL: https://github.com/apache/airflow/pull/69324#discussion_r3521787907
##########
airflow-core/src/airflow/dag_processing/manager.py:
##########
@@ -1312,7 +1315,10 @@ def _collect_results(self):
for file in finished:
processor = self._processors.pop(file)
- processor.logger_filehandle.close()
+ try:
+ processor.logger_filehandle.close()
+ except OSError:
+ self.log.warning("Failed to close log file handle for %s", file)
Review Comment:
Good suggestion will apply 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
Re: [PR] Make sure stale file handler doesn't crash the DagFileProcessorManager [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #69324:
URL: https://github.com/apache/airflow/pull/69324#discussion_r3543269853
##########
airflow-core/tests/unit/dag_processing/test_manager.py:
##########
@@ -497,6 +497,21 @@ def test_terminate_orphan_processes_kills_processor_when_file_is_truly_absent(se
)
processor.kill.assert_called_once_with(signal.SIGKILL)
+ def test_terminate_orphan_processes_tolerates_stale_file_handle_on_close(self):
+ """A stale NFS file handle on close (e.g. OpenShift) must not crash the manager."""
+ manager = DagFileProcessorManager(max_runs=1)
+ versioned_file = _get_versioned_file_info("callbacks.py")
+ processor = MagicMock()
Review Comment:
Nit (non-blocking): this test uses a full `MagicMock()` as the processor, so the production call `processor.close()` hits the mock's stubbed `close` and never runs the real `DagFileProcessorProcess.close()` — the `logger_filehandle.close.side_effect = OSError(...)` on the next line is never reached. It passes because the *old* call site touched `logger_filehandle` directly, but it doesn't actually exercise the OSError-swallowing logic it documents; it would still pass if `close()` re-raised. The other two tests use `self.mock_processor()` (a real `DagFileProcessorProcess` with a mock filehandle), which *does* exercise the try/except — switching this one to `self.mock_processor()` would give it real coverage and match the pattern.
--
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] Make sure stale file handler doesn't crash the DagFileProcessorManager [airflow]
Posted by "dabla (via GitHub)" <gi...@apache.org>.
dabla merged PR #69324:
URL: https://github.com/apache/airflow/pull/69324
--
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] Make sure stale file handler doesn't crash the DagFileProcessorManager [airflow]
Posted by "dabla (via GitHub)" <gi...@apache.org>.
dabla commented on PR #69324:
URL: https://github.com/apache/airflow/pull/69324#issuecomment-4919295698
> rebased it as well - fell free to merge with/without nit
Thanks for the review @potiuk will fix nits before merging.
--
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] Make sure stale file handler doesn't crash the DagFileProcessorManager [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on PR #69324:
URL: https://github.com/apache/airflow/pull/69324#issuecomment-4914175956
rebased it as well - fell free to merge with/without nit
--
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] Make sure stale file handler doesn't crash the DagFileProcessorManager [airflow]
Posted by "SameerMesiah97 (via GitHub)" <gi...@apache.org>.
SameerMesiah97 commented on code in PR #69324:
URL: https://github.com/apache/airflow/pull/69324#discussion_r3521578851
##########
airflow-core/src/airflow/dag_processing/manager.py:
##########
@@ -1312,7 +1315,10 @@ def _collect_results(self):
for file in finished:
processor = self._processors.pop(file)
- processor.logger_filehandle.close()
+ try:
+ processor.logger_filehandle.close()
+ except OSError:
+ self.log.warning("Failed to close log file handle for %s", file)
Review Comment:
nit: I would make the logs slightly more informative if you want:
```
except OSError:
self.log.warning(
"Failed to close log file handle for %s",
file_name,
exc_info=True,
)
```
--
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