Skip to content

Commit 15f17f6

Browse files
committed
Fix ExternalTaskSensor to use timeout parameter in deferrable mode (apache#62516)
ExternalTaskSensor was incorrectly using execution_timeout instead of timeout when deferring in deferrable mode, causing inconsistent behavior across poke, reschedule, and deferrable modes. Changes: - Updated execute() to use timedelta(seconds=self.timeout) with fallback to execution_timeout - Added comprehensive test coverage for timeout behavior in deferrable mode - Ensures consistent timeout semantics across all sensor modes
1 parent ceaf359 commit 15f17f6

2 files changed

Lines changed: 77 additions & 2 deletions

File tree

‎providers/standard/src/airflow/providers/standard/sensors/external_task.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,9 @@ def execute(self, context: Context) -> None:
435435
dttm_filter = self._get_dttm_filter(context)
436436
if AIRFLOW_V_3_0_PLUS:
437437
self.defer(
438-
timeout=self.execution_timeout,
438+
timeout=datetime.timedelta(seconds=self.timeout)
439+
if self.timeout
440+
else self.execution_timeout,
439441
trigger=WorkflowTrigger(
440442
external_dag_id=self.external_dag_id,
441443
external_task_group_id=self.external_task_group_id,
@@ -453,7 +455,9 @@ def execute(self, context: Context) -> None:
453455
)
454456
else:
455457
self.defer(
456-
timeout=self.execution_timeout,
458+
timeout=datetime.timedelta(seconds=self.timeout)
459+
if self.timeout
460+
else self.execution_timeout,
457461
trigger=WorkflowTrigger(
458462
external_dag_id=self.external_dag_id,
459463
external_task_group_id=self.external_task_group_id,

‎providers/standard/tests/unit/standard/sensors/test_external_task_sensor.py‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,6 +1049,77 @@ def test_external_task_sensor_deferrable(self, dag_maker):
10491049
assert exc.value.trigger.external_task_ids == ["test_task"]
10501050
assert exc.value.trigger.execution_dates == [DEFAULT_DATE]
10511051

1052+
@pytest.mark.execution_timeout(10)
1053+
def test_external_task_sensor_deferrable_uses_timeout(self, dag_maker):
1054+
"""Test that deferrable mode uses timeout parameter instead of execution_timeout."""
1055+
context = {"execution_date": DEFAULT_DATE}
1056+
with dag_maker() as dag:
1057+
op = ExternalTaskSensor(
1058+
task_id="test_external_task_sensor_check",
1059+
external_dag_id="test_dag_parent",
1060+
external_task_id="test_task",
1061+
deferrable=True,
1062+
timeout=60,
1063+
execution_timeout=timedelta(seconds=120),
1064+
)
1065+
dr = dag.create_dagrun(
1066+
run_id="test_run",
1067+
run_type=DagRunType.MANUAL,
1068+
state=None,
1069+
)
1070+
context.update(dag_run=dr, logical_date=DEFAULT_DATE)
1071+
1072+
with pytest.raises(TaskDeferred) as exc:
1073+
op.execute(context=context)
1074+
assert exc.value.timeout == timedelta(seconds=60)
1075+
1076+
@pytest.mark.execution_timeout(10)
1077+
def test_external_task_sensor_deferrable_fallback_to_execution_timeout(self, dag_maker):
1078+
"""Test that deferrable mode falls back to execution_timeout when timeout is not set."""
1079+
context = {"execution_date": DEFAULT_DATE}
1080+
with dag_maker() as dag:
1081+
op = ExternalTaskSensor(
1082+
task_id="test_external_task_sensor_check",
1083+
external_dag_id="test_dag_parent",
1084+
external_task_id="test_task",
1085+
deferrable=True,
1086+
execution_timeout=timedelta(seconds=120),
1087+
)
1088+
dr = dag.create_dagrun(
1089+
run_id="test_run",
1090+
run_type=DagRunType.MANUAL,
1091+
state=None,
1092+
)
1093+
context.update(dag_run=dr, logical_date=DEFAULT_DATE)
1094+
1095+
with pytest.raises(TaskDeferred) as exc:
1096+
op.execute(context=context)
1097+
assert exc.value.timeout == timedelta(seconds=120)
1098+
1099+
@pytest.mark.execution_timeout(10)
1100+
def test_external_task_sensor_deferrable_timeout_zero_uses_execution_timeout(self, dag_maker):
1101+
"""Test that deferrable mode falls back to execution_timeout when timeout is zero."""
1102+
context = {"execution_date": DEFAULT_DATE}
1103+
with dag_maker() as dag:
1104+
op = ExternalTaskSensor(
1105+
task_id="test_external_task_sensor_check",
1106+
external_dag_id="test_dag_parent",
1107+
external_task_id="test_task",
1108+
deferrable=True,
1109+
timeout=0,
1110+
execution_timeout=timedelta(seconds=120),
1111+
)
1112+
dr = dag.create_dagrun(
1113+
run_id="test_run",
1114+
run_type=DagRunType.MANUAL,
1115+
state=None,
1116+
)
1117+
context.update(dag_run=dr, logical_date=DEFAULT_DATE)
1118+
1119+
with pytest.raises(TaskDeferred) as exc:
1120+
op.execute(context=context)
1121+
assert exc.value.timeout == timedelta(seconds=120)
1122+
10521123
def test_get_logical_date(self):
10531124
"""For AF 2, we check for execution_date in context."""
10541125
context = {"execution_date": DEFAULT_DATE}

0 commit comments

Comments
 (0)