Skip to content

aws waiter util: log status info with error level on waiter error #32247

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

Merged
vincbeck merged 4 commits into from
Jun 29, 2023
Merged

aws waiter util: log status info with error level on waiter error #32247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
592929f
aws waiter util: log status info with error level on waiter error
vandonr-amz Jun 28, 2023
5200a35
fix tests
vandonr-amz Jun 28, 2023
16c7f65
more fixing
vandonr-amz Jun 29, 2023
ef789dd
Merge branch 'main' into vandonr/nice
vandonr-amz Jun 29, 2023
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
2 changes: 2 additions & 0 deletions airflow/providers/amazon/aws/utils/waiter_with_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ def wait(
break
except WaiterError as error:
if "terminal failure" in str(error):
log.error("%s: %s", failure_message, _LazyStatusFormatter(status_args, error.last_response))
raise AirflowException(f"{failure_message}: {error}")

log.info("%s: %s", status_message, _LazyStatusFormatter(status_args, error.last_response))
Expand Down Expand Up @@ -122,6 +123,7 @@ async def async_wait(
break
except WaiterError as error:
if "terminal failure" in str(error):
log.error("%s: %s", failure_message, _LazyStatusFormatter(status_args, error.last_response))
raise AirflowException(f"{failure_message}: {error}")

log.info("%s: %s", status_message, _LazyStatusFormatter(status_args, error.last_response))
Expand Down
20 changes: 6 additions & 14 deletions tests/providers/amazon/aws/utils/test_waiter_with_logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def test_wait_max_attempts_exceeded(self, mock_sleep, caplog):
},
)

mock_waiter.wait.call_count == 11
assert mock_waiter.wait.call_count == 2
mock_sleep.assert_called_with(123)
assert (
caplog.record_tuples
Expand Down Expand Up @@ -165,6 +165,7 @@ def test_wait_with_failure(self, mock_sleep, caplog):
last_response=generate_response("Failure"),
)
mock_waiter.wait.side_effect = [error, error, error, failure_error]

with pytest.raises(AirflowException) as exc:
wait(
waiter=mock_waiter,
Expand All @@ -175,6 +176,7 @@ def test_wait_with_failure(self, mock_sleep, caplog):
status_message="test status message",
status_args=["Status.State"],
)

assert "test failure message" in str(exc)
mock_waiter.wait.assert_called_with(
**{"test_arg": "test_value"},
Expand All @@ -183,17 +185,7 @@ def test_wait_with_failure(self, mock_sleep, caplog):
},
)
assert mock_waiter.wait.call_count == 4
assert (
caplog.record_tuples
== [
(
"airflow.providers.amazon.aws.utils.waiter_with_logging",
logging.INFO,
"test status message: Pending",
)
]
* 3
)
assert caplog.messages == ["test status message: Pending"] * 3 + ["test failure message: Failure"]

@mock.patch("time.sleep")
def test_wait_with_list_response(self, mock_sleep, caplog):
Expand Down Expand Up @@ -279,7 +271,7 @@ def test_wait_with_incorrect_args(self, mock_sleep, caplog):
"MaxAttempts": 1,
},
)
mock_waiter.wait.call_count == 3
assert mock_waiter.wait.call_count == 3
mock_sleep.assert_called_with(123)
assert (
caplog.record_tuples
Expand Down Expand Up @@ -320,7 +312,7 @@ def test_wait_with_multiple_args(self, mock_sleep, caplog):
status_message="test status message",
status_args=["Clusters[0].Status", "Clusters[0].StatusDetails", "Clusters[0].ClusterName"],
)
mock_waiter.wait.call_count == 3
assert mock_waiter.wait.call_count == 3
mock_sleep.assert_called_with(123)
assert (
caplog.record_tuples
Expand Down