shivannakarthik commented on code in PR #59854:
URL: https://github.com/apache/airflow/pull/59854#discussion_r2656783988
##########
providers/google/src/airflow/providers/google/cloud/operators/dataproc.py:
##########
@@ -996,35 +995,30 @@ def __init__(
def execute(self, context: Context) -> None:
hook = DataprocHook(gcp_conn_id=self.gcp_conn_id,
impersonation_chain=self.impersonation_chain)
- operation = self._delete_cluster(hook)
- if not self.deferrable:
- hook.wait_for_operation(timeout=self.timeout,
result_retry=self.retry, operation=operation)
- self.log.info("Cluster deleted.")
- else:
- try:
- hook.get_cluster(
- project_id=self.project_id, region=self.region,
cluster_name=self.cluster_name
- )
- except NotFound:
+ try:
+ op: operation.Operation = self._delete_cluster(hook)
+ if not self.deferrable:
+ hook.wait_for_operation(timeout=self.timeout,
result_retry=self.retry, operation=op)
self.log.info("Cluster deleted.")
- return
- except Exception as e:
- raise AirflowException(str(e))
-
- end_time: float = time.time() + self.timeout
- self.defer(
- trigger=DataprocDeleteClusterTrigger(
- gcp_conn_id=self.gcp_conn_id,
- project_id=self.project_id,
- region=self.region,
- cluster_name=self.cluster_name,
- end_time=end_time,
- metadata=self.metadata,
- impersonation_chain=self.impersonation_chain,
- polling_interval_seconds=self.polling_interval_seconds,
- ),
- method_name="execute_complete",
- )
+ else:
+ end_time: float = time.time() + self.timeout
+ self.defer(
+ trigger=DataprocDeleteClusterTrigger(
+ gcp_conn_id=self.gcp_conn_id,
+ project_id=self.project_id,
+ region=self.region,
+ cluster_name=self.cluster_name,
+ end_time=end_time,
+ metadata=self.metadata,
+ impersonation_chain=self.impersonation_chain,
+ polling_interval_seconds=self.polling_interval_seconds,
+ ),
+ method_name="execute_complete",
+ )
+ except NotFound:
+ raise AirflowSkipException("Cluster Already Deleted")
Review Comment:
The exception message could be a little more descriptive, may be as follows,
also consider adding a log message before raising the skip exception to aid
debugging:
```
except NotFound:
self.log.info(f"Cluster {self.cluster_name} not found in region
{self.region}. Skipping deletion.")
raise AirflowSkipException(f"Cluster {self.cluster_name} in region
{self.region} was not found - it may have already been deleted")
```
##########
providers/google/tests/unit/google/cloud/operators/test_dataproc.py:
##########
@@ -1270,7 +1275,36 @@ def test_create_execute_call_finished_before_defer(self,
mock_trigger_hook, mock
)
mock_hook.return_value.wait_for_operation.assert_not_called()
- assert not mock_defer.called
+ assert mock_defer.called
Review Comment:
Is this required?
--
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]
