Skip to content
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

[Serve] Add more nuanced checks for http proxy status errors #47896

Merged
merged 7 commits into from
Nov 20, 2024
Merged

[Serve] Add more nuanced checks for http proxy status errors #47896

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
64ddebd
Add more nuanced checks for http proxy status errors
Superskyyy Oct 4, 2024
a38edf3
Remove TODO
Superskyyy Oct 4, 2024
9dfbd33
Merge branch 'master' into feature/nuanced-status-code-check
Superskyyy Oct 4, 2024
be15344
Fix up lint
Superskyyy Oct 4, 2024
5c9fd9a
Update python/ray/serve/_private/proxy.py
Superskyyy Oct 4, 2024
0aae2ec
Merge branch 'ray-project:master' into feature/nuanced-status-code-check
Superskyyy Oct 12, 2024
61dcddc
Merge branch 'master' into feature/nuanced-status-code-check
edoakes Nov 5, 2024
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
19 changes: 12 additions & 7 deletions python/ray/serve/_private/proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,8 +999,7 @@ async def send_request_to_replica(
status_code = str(asgi_message["status"])
status = ResponseStatus(
code=status_code,
# TODO(edoakes): we need a more nuanced check than this.
is_error=status_code != "200",
is_error=not status_code.startswith("2"),
)
expecting_trailers = asgi_message.get("trailers", False)
elif asgi_message["type"] == "websocket.accept":
Expand All @@ -1022,11 +1021,17 @@ async def send_request_to_replica(
if not asgi_message.get("more_trailers", False):
response_generator.stop_checking_for_disconnect()
elif asgi_message["type"] == "websocket.disconnect":
status = ResponseStatus(
code=str(asgi_message["code"]),
# TODO(edoakes): we need a more nuanced check than this.
is_error=False,
)
status_code = str(asgi_message["code"])

# Check based on standard WebSocket status codes
if status_code in ["1000", "1001"]:
# Normal closure or going away, no error
is_error = False
else:
# Other 1xxx codes are specified as errors
is_error = status_code.startswith("1")

status = ResponseStatus(code=status_code, mis_error=is_error)
Superskyyy marked this conversation as resolved.
Show resolved Hide resolved
response_generator.stop_checking_for_disconnect()

yield asgi_message
Expand Down