Skip to content

CA-406770: Improve error message #6537

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
BengangY merged 1 commit into from
Jun 23, 2025
Merged

CA-406770: Improve error message #6537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 9 additions & 18 deletions ocaml/xapi/message_forwarding.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,24 +143,15 @@ let do_op_on_common ~local_fn ~__context ~host ~remote_fn f =
let task_opt = set_forwarding_on_task ~__context ~host in
f __context host task_opt remote_fn
with
| Xmlrpc_client.Connection_reset | Http_client.Http_request_rejected _ ->
warn
"Caught Connection_reset when contacting host %s; converting into \
CANNOT_CONTACT_HOST"
(Ref.string_of host) ;
raise
(Api_errors.Server_error
(Api_errors.cannot_contact_host, [Ref.string_of host])
)
| Xmlrpc_client.Stunnel_connection_failed ->
warn
"Caught Stunnel_connection_failed while contacting host %s; converting \
into CANNOT_CONTACT_HOST"
(Ref.string_of host) ;
raise
(Api_errors.Server_error
(Api_errors.cannot_contact_host, [Ref.string_of host])
)
| ( Xmlrpc_client.Connection_reset
| Http_client.Http_request_rejected _
| Xmlrpc_client.Stunnel_connection_failed ) as e
->
error
"%s: Caught %s when contacting host %s; converting into \
CANNOT_CONTACT_HOST"
__FUNCTION__ (Printexc.to_string e) (Ref.string_of host) ;
raise Api_errors.(Server_error (cannot_contact_host, [Ref.string_of host]))

(* regular forwarding fn, with session and live-check. Used by most calls, will
use the connection cache. *)
Expand Down
15 changes: 13 additions & 2 deletions ocaml/xapi/workload_balancing.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,19 @@ let wlb_request ~__context ~host ~port ~auth ~meth ~params ~handler ~enable_log
with
| Remote_requests.Timed_out ->
raise_timeout timeout
| Http_client.Http_request_rejected _ | Http_client.Http_error _ ->
raise_authentication_failed ()
| Http_client.Http_error (code, _) as e -> (
error "%s: Caught %s when contacting WLB" __FUNCTION__
(Printexc.to_string e) ;
match code with
| "401" | "403" ->
raise_authentication_failed ()
| _ ->
raise_connection_reset ()
)
| Http_client.Http_request_rejected _ as e ->
error "%s: Caught %s when contacting WLB" __FUNCTION__
(Printexc.to_string e) ;
raise_connection_reset ()
| Xmlrpc_client.Connection_reset ->
raise_connection_reset ()
| Stunnel.Stunnel_verify_error reason ->
Expand Down
Loading