Lee-W commented on code in PR #32513:
URL: https://github.com/apache/airflow/pull/32513#discussion_r1269054684
##########
airflow/providers/amazon/aws/operators/emr.py:
##########
@@ -1079,6 +1100,35 @@ def execute(self, context: Context) -> str | None:
)
return application_id
+ def start_application_deferred(self, context: Context, event: dict[str,
Any] | None = None) -> None:
+ if event is None:
+ self.log.error("Trigger error: event is None")
+ raise AirflowException("Trigger error: event is None")
+ elif event["status"] != "success":
+ raise AirflowException(f"Application {event['application_id']}
failed to create")
+ self.log.info("Starting application %s", event["application_id"])
+ self.hook.conn.start_application(applicationId=event["application_id"])
+ self.defer(
+ trigger=EmrServerlessStartApplicationTrigger(
+ application_id=event["application_id"],
+ aws_conn_id=self.aws_conn_id,
+ waiter_delay=self.waiter_delay,
+ waiter_max_attempts=self.waiter_max_attempts,
+ ),
+ timeout=timedelta(seconds=self.waiter_max_attempts *
self.waiter_delay),
+ method_name="execute_complete",
+ )
+
+ def execute_complete(self, context: Context, event: dict[str, Any] | None
= None) -> None:
+ if event is None:
+ self.log.error("Trigger error: event is None")
+ raise AirflowException("Trigger error: event is None")
+ elif event["status"] != "success":
+ raise AirflowException(f"Application {event['application_id']}
failed to start")
+ else:
+ self.log.info("Application %s started", event["application_id"])
+ return event["application_id"]
Review Comment:
```suggestion
self.log.info("Application %s started", event["application_id"])
return event["application_id"]
```
##########
airflow/providers/amazon/aws/operators/emr.py:
##########
@@ -1332,16 +1391,46 @@ def execute(self, context: Context) -> None:
self.log.info("Stopping application: %s", self.application_id)
if self.force_stop:
- self.hook.cancel_running_jobs(
- self.application_id,
- waiter_config={
- "Delay": self.waiter_delay,
- "MaxAttempts": self.waiter_max_attempts,
- },
+ count = self.hook.cancel_running_jobs(
+ application_id=self.application_id,
+ wait_for_completion=False,
)
+ if count > 0:
+ self.log.info("now waiting for the %s cancelled job(s) to
terminate", count)
+ if self.deferrable:
+ self.defer(
+ trigger=EmrServerlessCancelJobsTrigger(
+ application_id=self.application_id,
+ aws_conn_id=self.aws_conn_id,
+ waiter_delay=self.waiter_delay,
+ waiter_max_attempts=self.waiter_max_attempts,
+ ),
+ timeout=timedelta(seconds=self.waiter_max_attempts *
self.waiter_delay),
+ method_name="stop_application",
+ )
+ self.hook.get_waiter("no_job_running").wait(
Review Comment:
Do we need to add an else clause here? Looks like
`EmrServerlessCancelJobsTrigger` is waiting for it as well.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
