Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions airflow-core/src/airflow/jobs/scheduler_job_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

from airflow import settings
from airflow._shared.timezones import timezone
from airflow.api_fastapi.execution_api.datamodels.taskinstance import TIRunContext
from airflow.api_fastapi.execution_api.datamodels.taskinstance import DagRun as DRDataModel, TIRunContext
from airflow.callbacks.callback_requests import DagCallbackRequest, DagRunContext, TaskCallbackRequest
from airflow.configuration import conf
from airflow.dag_processing.bundles.base import BundleUsageTrackingManager
Expand Down Expand Up @@ -768,6 +768,7 @@ def process_executor_events(
select(TI)
.where(filter_for_tis)
.options(selectinload(TI.dag_model))
.options(selectinload(TI.dag_run).selectinload(DagRun.consumed_asset_events))
.options(joinedload(TI.dag_version))
)
# row lock this entire set of taskinstances to make sure the scheduler doesn't fail when we have
Expand Down Expand Up @@ -888,7 +889,7 @@ def process_executor_events(
ti=ti,
msg=msg,
context_from_server=TIRunContext(
dag_run=ti.dag_run,
dag_run=DRDataModel.model_validate(ti.dag_run, from_attributes=True),
max_tries=ti.max_tries,
variables=[],
connections=[],
Expand Down Expand Up @@ -2266,7 +2267,7 @@ def _purge_task_instances_without_heartbeats(
ti=ti,
msg=str(task_instance_heartbeat_timeout_message_details),
context_from_server=TIRunContext(
dag_run=ti.dag_run,
dag_run=DRDataModel.model_validate(ti.dag_run, from_attributes=True),
max_tries=ti.max_tries,
variables=[],
connections=[],
Expand Down
Loading