less invasive fix

apache · Jan 10, 2025 · 37c41a2 · 37c41a2
1 parent 998c201
commit 37c41a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/airflow/dag_processing/processor.py b/airflow/dag_processing/processor.py
@@ -50,8 +50,13 @@ def _parse_file_entrypoint():
     import structlog
 
     from airflow.sdk.execution_time import task_runner
+    from airflow.settings import configure_orm
     # Parse DAG file, send JSON back up!
 
+    # We need to reconfigure the orm here, as DagFileProcessorManager does db queries for bundles, and
+    # the session across forks blows things up.
+    configure_orm()
+
     comms_decoder = task_runner.CommsDecoder[DagFileParseRequest, DagFileParsingResult](
         input=sys.stdin,
         decoder=TypeAdapter[DagFileParseRequest](DagFileParseRequest),

diff --git a/task_sdk/src/airflow/sdk/execution_time/supervisor.py b/task_sdk/src/airflow/sdk/execution_time/supervisor.py
@@ -254,10 +254,6 @@ def exit(n: int) -> NoReturn:
                 atexit._run_exitfuncs()
                 base_exit(n)
 
-    from airflow import settings
-
-    settings.configure_orm()
-
     try:
         target()
         exit(0)