Skip to content

Improve error handling in edge worker on 405 #60425

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
jscheffl merged 2 commits into from
Jan 12, 2026
Merged

Improve error handling in edge worker on 405 #60425

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
309118d
Improve Edge Worker error handling on HTTP 405
jscheffl Jan 12, 2026
7228243
Add pytest
jscheffl Jan 12, 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
3 changes: 2 additions & 1 deletion providers/edge3/src/airflow/providers/edge3/cli/worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,8 @@ async def start(self):
logger.error(str(e))
raise SystemExit(str(e))
except ClientResponseError as e:
if e.status == HTTPStatus.NOT_FOUND:
# Note: Method not allowed is raised by FastAPI if the API is not enabled (not 404)
if e.status in {HTTPStatus.NOT_FOUND, HTTPStatus.METHOD_NOT_ALLOWED}:
raise SystemExit(
"Error: API endpoint is not ready, please set [edge] api_enabled=True. Or check if the URL is correct to your deployment."
)
Expand Down
15 changes: 12 additions & 3 deletions providers/edge3/tests/unit/edge3/cli/test_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,21 @@ async def test_version_mismatch(self, mock_set_state, worker_with_job):
await worker_with_job.heartbeat()
assert worker_with_job.drain

@pytest.mark.parametrize(
"http_error",
[
pytest.param(404, id="HTTP 404 Not Found"),
pytest.param(405, id="HTTP 405 Method Not Allowed"),
],
)
@patch("airflow.providers.edge3.cli.worker.worker_register")
async def test_start_missing_apiserver(self, mock_register_worker, worker_with_job: EdgeWorker):
async def test_start_missing_apiserver(
self, mock_register_worker, http_error, worker_with_job: EdgeWorker
):
mock_register_worker.side_effect = ClientResponseError(
request_info=RequestInfo(url=URL("mock.com"), method="GET", headers=None), # type:ignore[arg-type]
message="Something with 404:NOT FOUND means API is not active",
status=404,
message=f"Something with {http_error}: Means API is not active",
status=http_error,
history=(),
)
with pytest.raises(SystemExit, match=r"API endpoint is not ready"):
Expand Down