Fix for EksCreateClusterOperator deferrable mode #36079
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
boring-cyborg
bot
added
area:providers
provider:amazon-aws
Taragolis
reviewed
Dec 6, 2023
| @@ -253,6 +253,7 @@ def __init__( | |||
| self.fargate_selectors = fargate_selectors or [{"namespace": DEFAULT_NAMESPACE_NAME}] | |||
| self.fargate_profile_name = fargate_profile_name | |||
| self.deferrable = deferrable | |||
| self.eks_hook = EksHook(aws_conn_id=self.aws_conn_id, region_name=self.region) | |||
There was a problem hiding this comment.
Small suggestion, maybe we could use hook property as we use in other boto3 related hooks, so it become more consistent to other hooks?
E.g.
@cached_property
def hook(self) -> EksHook:
return EksHook(aws_conn_id=self.aws_conn_id, region_name=self.region)
@property
def eks_hook(self):
warning.warn(
"`eks_hook` property is deprecated and will be removed in the future. "
"Please use `hook` property instead.",
AirflowProviderDeprecationWarning
stacklevel=2,
)
return self.eks_hook
Taragolis
reviewed
Dec 6, 2023
| self.log.info("Cluster deleted") | ||
| raise event["exception"] | ||
| raise AirflowException("Error creating cluster") |
There was a problem hiding this comment.
Suggested change
| raise AirflowException("Error creating cluster") | |
| raise AirflowException("Error creating cluster") |
Small suggestion to move raise an error out of the condition block, I guess execute_failed method always expected to raise an error, so just in case raise an error even if status not None or not "deleted", which I guess not possible right now
There was a problem hiding this comment.
That's a good point. It shouldn't ever be the case that we don't get a deleted status, but there's no reason not to move the exception out of the block
…ow waiting for cluster to be deleted if the delete has already been initiated.
|
Static check failure |
|
Sorry missed that one. Everything is passing now |
vincbeck
approved these changes
Dec 7, 2023
50 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR addresses the issues that were discovered out in the
EksCreateClusterOperatordeferrable mode. There are several changes made.EksCreateClusterTriggerdid not set a status as failed, but the operator expected afailedstatus if the cluster creation did not go as expected. I've added a newrunmethod that yields afailedstatus on failure.deferrable_create_cluster_next, there was a bug where we were assuming the compute type could only be fargate or nodegroup. This is not true; the compute type can beNoneas well. This is fixed by adding an explicit check.EksDeleteClusterTrigger, there was a bug where the cluster would only get deleted ifforce_delete_computewasTrue.closes: Required to fix error handling in
EksCreateClusterOperatorin deferrable mode #34844related: Fix error handling in EksCreateClusterOperator in deferrable mode #34966
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in newsfragments.