mattwang44 opened a new pull request, #75059:
URL: https://github.com/apache/airflow/pull/75059
The airflowctl API client retries 5xx responses and `httpx.RequestError`s,
but its tenacity decorator passed `before_log` as the `before_sleep` callback.
`before_log` is meant for the `before` slot: it only reports the attempt
number, so the warning printed while waiting to retry says nothing about why
the request failed, and the count is off by one (it says "1st time" right
before the second attempt).
With no API server listening on `localhost:8080`, `airflowctl dags list` on
`main` prints:
```
[warning ] Starting call to 'airflowctl.api.client.Client.request', this is
the 1st time calling it. [airflowctl.api.client]
[warning ] Starting call to 'airflowctl.api.client.Client.request', this is
the 2nd time calling it. [airflowctl.api.client]
command failed due to Connection refused. Is the API server running?
```
This PR switches the callback to `before_sleep_log`, which logs the
exception and the wait before the next attempt:
```
[warning ] Retrying airflowctl.api.client.Client.request in 1 seconds as it
raised ConnectError: [Errno 61] Connection refused. [airflowctl.api.client]
[warning ] Retrying airflowctl.api.client.Client.request in 1.77 seconds as
it raised ConnectError: [Errno 61] Connection refused. [airflowctl.api.client]
command failed due to Connection refused. Is the API server running?
```
The Edge Worker client got the same fix in #58480. The Task SDK client
(`task-sdk/src/airflow/sdk/api/client.py`) uses the same pattern; it is a
different distribution and its callback also records an OTel span event, so it
is not changed here.
Testing:
- Added `test_retry_logs_error_and_wait_before_sleep`. It fixes the wait at
2 seconds, mocks the sleep, and captures the warning with
`structlog.testing.capture_logs()`. The airflow-ctl test environment does not
route structlog through `caplog`, so this is the structured option there. The
test fails on `main` (it captures the "Starting call to ..." event) and passes
with this change.
- `uv run --project airflow-ctl pytest airflow-ctl/tests`: 442 passed.
- `prek run --from-ref main --stage pre-commit` (including
`mypy-airflow-ctl`) and the manual stage pass.
<!-- SPDX-License-Identifier: Apache-2.0
https://www.apache.org/licenses/LICENSE-2.0 -->
<!--
Thank you for contributing!
Please provide above a brief description of the changes made in this pull
request.
Write a good git commit message following this guide:
https://chris.beams.io/posts/git-commit/
Please make sure that your code changes are covered with tests.
And in case of new features or big changes remember to adjust the
documentation.
For user-facing UI changes, please attach before/after screenshots (or a
short
screen recording) so reviewers can assess the visual impact.
Feel free to ping (in general) for the review if you do not see reaction for
a few days
(72 Hours is the minimum reaction time you can expect from volunteers) - we
sometimes miss notifications.
In case of an existing issue, reference it using one of the following:
* closes: #ISSUE
* related: #ISSUE
-->
---
##### Was generative AI tooling used to co-author this PR?
<!--
If generative AI tooling has been used in the process of authoring this PR,
please
change below checkbox to `[X]` followed by the name of the tool, uncomment
the "Generated-by".
-->
- [X] Yes — Claude Code (Claude Opus 5.5), following [the
guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
<!--
Generated-by: [Tool Name] following [the
guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
-->
<!--
---
* Read the **[Pull Request
Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)**
for more information. Note: commit author/co-author name and email in commits
become permanently public when merged.
* For fundamental code changes, an Airflow Improvement Proposal
([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals))
is needed.
* When adding dependency, check compliance with the [ASF 3rd Party License
Policy](https://www.apache.org/legal/resolved.html#category-x).
* For significant user-facing changes create newsfragment:
`{pr_number}.significant.rst`, in
[airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).
You can add this file in a follow-up commit after the PR is created so you
know the PR number.
-->
--
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]
