You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "ashb (via GitHub)" <gi...@apache.org> on 2025/10/24 21:02:37 UTC

[PR] Add support for "reconnecting" Supervisor Comms and logs in task processes [airflow]

ashb opened a new pull request, #57212:
URL: https://github.com/apache/airflow/pull/57212

   This change relates to #51422, #54706 and gives us a single function that we can call from the Python Virtual env script to re-connect the SUPERVISOR_COMMS and logs socket, so variables and connections are accessible from within the VEnv task, as long as task-sdk is installed.
   
   This also fixes logs produced by a venv task to not be double "encoded" (i.e. so that we directly see the actual log, not a stringification of the entire log line with two timestamps etc.)
   
   There is a matching change to the Venv script to use this function, but it is separated into a different PR so that we don't merge core/sdk and provider changes in one PR.
   
   The crux of the change in the venv operator (that I've already tested) is this
   
   ```diff
   +try:
   +    from airflow.sdk.execution_time import task_runner
   +except ModuleNotFoundError:
   +    pass
   +else:
   +  reinit_supervisor_comms = getattr(task_runner, "reinit_supervisor_comms")
   +  if reinit_supervisor_comms:
   +      reinit_supervisor_comms()
   ```
   
   <!--
    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] Add support for "reconnecting" Supervisor Comms and logs in task processes [airflow]

Posted by "ashb (via GitHub)" <gi...@apache.org>.
ashb commented on code in PR #57212:
URL: https://github.com/apache/airflow/pull/57212#discussion_r2464801110


##########
task-sdk/src/airflow/sdk/execution_time/task_runner.py:
##########
@@ -1467,6 +1460,28 @@ def main():
             with suppress(Exception):
                 SUPERVISOR_COMMS.socket.close()
 
+def reinit_supervisor_comms() -> StartupDetails:

Review Comment:
   Correct, yeah. (I did in an earlier version, but forgot to update this sig)



-- 
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] Add support for "reconnecting" Supervisor Comms and logs in task processes [airflow]

Posted by "ashb (via GitHub)" <gi...@apache.org>.
ashb commented on PR #57212:
URL: https://github.com/apache/airflow/pull/57212#issuecomment-3451783184

   Error is unrealted, fixed in [#57351](https://redirect.github.com/apache/airflow/pull/57351)


-- 
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] Add support for "reconnecting" Supervisor Comms and logs in task processes [airflow]

Posted by "ashb (via GitHub)" <gi...@apache.org>.
ashb merged PR #57212:
URL: https://github.com/apache/airflow/pull/57212


-- 
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] Add support for "reconnecting" Supervisor Comms and logs in task processes [airflow]

Posted by "ashb (via GitHub)" <gi...@apache.org>.
ashb commented on PR #57212:
URL: https://github.com/apache/airflow/pull/57212#issuecomment-3451785175

   Oh hmmmm, something is timing out now actually.


-- 
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] Add support for "reconnecting" Supervisor Comms and logs in task processes [airflow]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #57212:
URL: https://github.com/apache/airflow/pull/57212#issuecomment-3457260629

   ### Backport failed to create: v3-1-test. View the failure log <a href='https://github.com/apache/airflow/actions/runs/18881150470'> Run details </a>
   
   <table>
       <tr>
           <th>Status</th>
           <th>Branch</th>
           <th>Result</th>
       </tr>
       <tr>
           <td>❌</td>
           <td>v3-1-test</td>
           <td><a href="https://github.com/apache/airflow/commit/ff4e471"><img src='https://img.shields.io/badge/Commit-ff4e471-red' alt='Commit Link'></a></td>
       </tr>
   </table>
   
   You can attempt to backport this manually by running:
   
   ```bash
   cherry_picker ff4e471 v3-1-test
   ```
   
   This should apply the commit to the v3-1-test branch and leave the commit in conflict state marking
   the files that need manual conflict resolution.
   
   After you have resolved the conflicts, you can continue the backport process by running:
   
   ```bash
   cherry_picker --continue
   ```
   


-- 
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] Add support for "reconnecting" Supervisor Comms and logs in task processes [airflow]

Posted by "amoghrajesh (via GitHub)" <gi...@apache.org>.
amoghrajesh commented on code in PR #57212:
URL: https://github.com/apache/airflow/pull/57212#discussion_r2464619482


##########
task-sdk/src/airflow/sdk/execution_time/task_runner.py:
##########
@@ -1467,6 +1460,28 @@ def main():
             with suppress(Exception):
                 SUPERVISOR_COMMS.socket.close()
 
+def reinit_supervisor_comms() -> StartupDetails:

Review Comment:
   ```suggestion
   def reinit_supervisor_comms() -> None:
   ```
   
   We do not return do we?



-- 
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] Add support for "reconnecting" Supervisor Comms and logs in task processes [airflow]

Posted by "ashb (via GitHub)" <gi...@apache.org>.
ashb commented on code in PR #57212:
URL: https://github.com/apache/airflow/pull/57212#discussion_r2461995482


##########
airflow-core/src/airflow/settings.py:
##########
@@ -700,17 +700,18 @@ def initialize():
     configure_adapters()
     # The webservers import this file from models.py with the default settings.
 
-    if not os.environ.get("PYTHON_OPERATORS_VIRTUAL_ENV_MODE", None):
-        is_worker = os.environ.get("_AIRFLOW__REEXECUTED_PROCESS") == "1"
-        if not is_worker:
-            configure_orm()
-    configure_action_logging()
-
     # Configure secrets masker before masking secrets
     _configure_secrets_masker()
 
-    # mask the sensitive_config_values
-    conf.mask_secrets()
+    is_worker = os.environ.get("_AIRFLOW__REEXECUTED_PROCESS") == "1"
+    if not os.environ.get("PYTHON_OPERATORS_VIRTUAL_ENV_MODE", None) and not is_worker:
+        configure_orm()
+
+        # mask the sensitive_config_values
+        conf.mask_secrets()
+    configure_action_logging()

Review Comment:
   This is re-ordered, so that when this is used in the virtualenv script, we don't log things before the logging is configured (resulting in "odd" output)



-- 
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] Add support for "reconnecting" Supervisor Comms and logs in task processes [airflow]

Posted by "ashb (via GitHub)" <gi...@apache.org>.
ashb commented on PR #57212:
URL: https://github.com/apache/airflow/pull/57212#issuecomment-3445976680

   > Question: We have a script that uses boto to fetch an EKS token that we use for the EksPodOperator. Currently we have to store credentials temporarily in a file (scope to read-only by the airflow user) because that script cannot read from Airflow Connections. Could this code be used to gain access to comms from something like that?
   
   @o-nikolas maybe, but this approach will only work for a subprocess of the original task process.


-- 
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