Fix Cloud Composer Сreate environment operator to validate final env state after creation#64956
Open
VladaZakharova wants to merge 1 commit intoapache:mainfrom
Open
Fix Cloud Composer Сreate environment operator to validate final env state after creation#64956VladaZakharova wants to merge 1 commit intoapache:mainfrom
VladaZakharova wants to merge 1 commit intoapache:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the Google Cloud Composer “create environment” operator to only report success when the environment is actually usable (i.e., in RUNNING), addressing cases where the create LRO or AlreadyExists path could otherwise allow unhealthy environments to pass as successful.
Changes:
- Re-check Composer environment state via
get_environment()after create operation completion and on theAlreadyExistspath; fail unless state isRUNNING. - Extend unit tests to cover post-operation state validation,
AlreadyExistsbehavior, and deferrableexecute_completevalidation. - Update system test example + docs to add a retry cleanup callback that deletes environments left in
ERRORbefore retrying creation.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| providers/google/src/airflow/providers/google/cloud/operators/cloud_composer.py | Adds environment state validation logic for create (sync + deferrable) and AlreadyExists flows. |
| providers/google/tests/unit/google/cloud/operators/test_cloud_composer.py | Adds unit coverage for new state validation behavior and error cases. |
| providers/google/tests/system/google/cloud/composer/example_cloud_composer.py | Adds retry cleanup callback for system-test create retries; configures retries for create tasks. |
| providers/google/docs/operators/cloud/cloud_composer.rst | Documents new “succeed only when RUNNING” behavior and shows retry cleanup example snippet. |
|
|
||
| if env_state != Environment.State.RUNNING: | ||
| raise AirflowException( | ||
| "Create environment operation completed, but the Composer environment is not in RUNNING state. " |
Comment on lines
+83
to
+86
| def _mock_environment(state: int) -> mock.MagicMock: | ||
| environment = mock.MagicMock() | ||
| environment.state = state | ||
| return environment |
Comment on lines
+124
to
+136
| log.info( | ||
| "Retry cleanup started for Composer env. project_id=%s region=%s environment_id=%s", | ||
| PROJECT_ID, | ||
| REGION, | ||
| environment_id, | ||
| ) | ||
|
|
||
| try: | ||
| environment = hook.get_environment( | ||
| project_id=PROJECT_ID, | ||
| region=REGION, | ||
| environment_id=environment_id, | ||
| ) |
This file contains hidden or 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
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.
Fix Cloud Composer environment creation to succeed only when the environment is actually usable.
Previously, create could rely on stale state from the create long-running operation, and the AlreadyExists path could incorrectly treat an environment in a bad state as success. This PR makes the create operator verify the current environment state and fail unless it is RUNNING.
The system test retry flow is also updated to delete environments left in ERROR before retrying creation.
Was generative AI tooling used to co-author this PR?
{pr_number}.significant.rst, in airflow-core/newsfragments. You can add this file in a follow-up commit after the PR is created so you know the PR number.