Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion airflow-core/tests/unit/cli/commands/test_dag_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ def execute(self, context, event=None):
self.defer(trigger=trigger, method_name="execute")
return
print("RESUMING")
return self.tfield + 1
assert self.tfield + 1 == 3

task_one = one()
task_two = two(task_one)
Expand Down
7 changes: 6 additions & 1 deletion task-sdk/src/airflow/sdk/definitions/dag.py
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,8 @@ def _run_task(*, ti, run_triggerer=False):
ti.task = taskrun_result.ti.task

if ti.state == State.DEFERRED and isinstance(msg, DeferTask) and run_triggerer:
from airflow.utils.session import create_session

# API Server expects the task instance to be in QUEUED state before
# resuming from deferral.
ti.set_state(State.QUEUED)
Expand All @@ -1259,7 +1261,10 @@ def _run_task(*, ti, run_triggerer=False):
ti.next_kwargs = {"event": event.payload} if event else msg.next_kwargs
log.info("[DAG TEST] Trigger completed")

ti.set_state(State.SUCCESS)
# Set the state to SCHEDULED so that the task can be resumed.
with create_session() as session:
ti.state = State.SCHEDULED
session.add(ti)

return taskrun_result
except Exception:
Expand Down
Loading