Skip to content

Fix(Amazon): Restore wait_policy in EmrCreateJobFlowOperator #61373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dv-gorasiya wants to merge 2 commits into from
+22 −25
Closed

Fix(Amazon): Restore wait_policy in EmrCreateJobFlowOperator #61373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f20391c
Fix(Amazon): Allow configuring wait_policy in EmrCreateJobFlowOperator
dv-gorasiya Feb 3, 2026
baea7da
Test(Amazon): Add test for wait_policy in EmrCreateJobFlowOperator
dv-gorasiya Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions providers/amazon/src/airflow/providers/amazon/aws/operators/emr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,25 +701,12 @@ def __init__(
self.waiter_max_attempts = waiter_max_attempts or 60
self.waiter_delay = waiter_delay or 60
self.deferrable = deferrable
self.wait_policy = wait_policy

if wait_policy is not None:
warnings.warn(
"`wait_policy` parameter is deprecated and will be removed in a future release; "
"please use `wait_for_completion` (bool) instead.",
AirflowProviderDeprecationWarning,
stacklevel=2,
)

if wait_for_completion is not None:
raise ValueError(
"Cannot specify both `wait_for_completion` and deprecated `wait_policy`. "
"Please use `wait_for_completion` (bool)."
)

self.wait_for_completion = wait_policy in (
WaitPolicy.WAIT_FOR_COMPLETION,
WaitPolicy.WAIT_FOR_STEPS_COMPLETION,
)
if wait_for_completion is False:
raise ValueError("Cannot specify wait_policy with wait_for_completion=False")
self.wait_for_completion = True

@property
def _hook_parameters(self):
Expand Down Expand Up @@ -758,7 +745,7 @@ def execute(self, context: Context) -> str | None:
log_uri=get_log_uri(emr_client=self.hook.conn, job_flow_id=self._job_flow_id),
)
if self.wait_for_completion:
waiter_name = WAITER_POLICY_NAME_MAPPING[WaitPolicy.WAIT_FOR_COMPLETION]
waiter_name = WAITER_POLICY_NAME_MAPPING[self.wait_policy or WaitPolicy.WAIT_FOR_COMPLETION]

if self.deferrable:
self.defer(
Expand Down
24 changes: 17 additions & 7 deletions providers/amazon/tests/unit/amazon/aws/operators/test_emr_create_job_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,20 @@ def test_create_job_flow_deferrable_no_wait(self, mocked_hook_client):
def test_template_fields(self):
validate_template_fields(self.operator)

def test_wait_policy_deprecation_warning(self):
"""Test that using wait_policy raises a deprecation warning."""
with pytest.warns(AirflowProviderDeprecationWarning, match="`wait_policy` parameter is deprecated"):
EmrCreateJobFlowOperator(
task_id=TASK_ID,
wait_policy=WaitPolicy.WAIT_FOR_COMPLETION,
)
@mock.patch("botocore.waiter.get_service_module_name", return_value="emr")
@mock.patch.object(Waiter, "wait")
def test_execute_with_wait_policy(self, mock_waiter, _, mocked_hook_client):
mocked_hook_client.run_job_flow.return_value = RUN_JOB_FLOW_SUCCESS_RETURN

# Test that providing wait_policy uses the correct waiter
op = EmrCreateJobFlowOperator(
task_id="test_wait_policy",
aws_conn_id="aws_default",
emr_conn_id="emr_default",
wait_policy=WaitPolicy.WAIT_FOR_STEPS_COMPLETION,
)

op.execute(self.mock_context)

mock_waiter.assert_called_once_with(mock.ANY, ClusterId=JOB_FLOW_ID, WaiterConfig=mock.ANY)
assert_expected_waiter_type(mock_waiter, WAITER_POLICY_NAME_MAPPING[WaitPolicy.WAIT_FOR_STEPS_COMPLETION])