kaxil opened a new pull request, #50419:
URL: https://github.com/apache/airflow/pull/50419
Fixes a subtle bug where `SUPERVISOR_COMMS` was incorrectly set during
supervisor-side request handling in `InProcessSupervisorComms.send_request()`.
When calling the supervisor’s `_handle_request()` (e.g. in response to a
connection or variable fetch), some internal logic (like `Variable.get()` or
`Connection.get_connection_from_secrets()`) would incorrectly detect that it
was running in a Task SDK execution context — because `SUPERVISOR_COMMS` was
still set.
This led to recursive calls into the SDK flow (e.g., calling
`SUPERVISOR_COMMS.lock`) **while already holding the lock**, resulting in
`AttributeError: 'NoneType' object has no attribute 'lock'` or deadlocks.
- The fix ensures `SUPERVISOR_COMMS` is temporarily unset while handling the
request.
- This prevents Task SDK context detection logic from activating during
supervisor API handling.
- The `set_supervisor_comms(None)` context manager is now explicitly used
within `send_request()` to guard the call to `_handle_request()`.
- Unit tests for `set_supervisor_comms()` covering all override/restore edge
cases
- A roundtrip test that verifies `send_request()` triggers
`_handle_request()`, which in turn uses `send_msg()` to queue a response
retrievable via `get_message()`
This fixes real bugs encountered when using `dag.test()` in system tests
that rely on connections or variables:
- Tasks attempting to fetch a connection during execution caused the
supervisor to recurse into its own comms path
- This led to incorrect error handling (`500 Internal Server Error`) and
test failures
- Based on debugging a failure in the `example_athena` system test under
`dag.test()`
- Prevents regressions for other DAGs/tasks that rely on connection or
variable fetches inside Task SDK runtime
<!--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
