Lee-W commented on code in PR #39585:
URL: https://github.com/apache/airflow/pull/39585#discussion_r1620081512
##########
airflow/models/taskinstance.py:
##########
@@ -1580,13 +1581,39 @@ def _coalesce_to_orm_ti(*, ti: TaskInstancePydantic |
TaskInstance, session: Ses
@internal_api_call
@provide_session
-def _defer_task(
+def _defer_task_from_task_deferred(
ti: TaskInstance | TaskInstancePydantic, exception: TaskDeferred, session:
Session = NEW_SESSION
) -> TaskInstancePydantic | TaskInstance:
from airflow.models.trigger import Trigger
# First, make the trigger entry
trigger_row = Trigger.from_object(exception.trigger)
+ updated_ti = _defer_task(
+ ti=ti,
+ session=session,
+ trigger_row=trigger_row,
+ trigger_kwargs=exception.kwargs,
+ next_method=exception.method_name,
+ timeout=exception.timeout,
+ )
+
+ session.merge(updated_ti)
+ session.commit()
+ return updated_ti
+
+
+@internal_api_call
+@provide_session
+def _defer_task(
Review Comment:
> i think it's unnecessary to change the signature of this function and add
the other two wrapper functions.
The main reason for this PR to exist is that we don't want to run user code
in scheduler
https://github.com/apache/airflow/pull/38674/files#diff-807ca0a4fd53aeb41166621c9842b0f89b7931fc64e9a60befa36c776db45efaR1215-R1221.
To do that, I change the code to accept only the args needed for marking a
task as deferred directly instead of doing the import and serialization process.
```python
trigger_row = Trigger(
classpath=start_trigger_args.trigger_cls,
kwargs=start_trigger_args.trigger_kwargs
)
```
> unfortunately, we don't have integration tests set up for AIP-44 but if we
did then it would reveal that this will break that mode of execution because
for example there's no mechanism for serializing Trigger, possibly among other
things.
I didn't quite understand that part. Could you provide more details or
clarify it for me? Thanks!
--
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-unsubscr...@airflow.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
