Skip to content

CA-410948 Refine the Exception when disable/enable SSH failed #6487

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

CA-410948 Refine the Exception when disable/enable SSH failed #6487

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
9 changes: 6 additions & 3 deletions ocaml/xapi/xapi_host.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3121,7 +3121,8 @@ let disable_ssh_internal ~__context ~self =
with e ->
error "Failed to disable SSH for host %s: %s" (Ref.string_of self)
(Printexc.to_string e) ;
Helpers.internal_error "Failed to disable SSH: %s" (Printexc.to_string e)
Helpers.internal_error "Failed to disable SSH access, host: %s"
(Ref.string_of self)

let schedule_disable_ssh_job ~__context ~self ~timeout =
let host_uuid = Helpers.get_localhost_uuid () in
Expand Down Expand Up @@ -3168,7 +3169,8 @@ let enable_ssh ~__context ~self =
( match timeout with
| 0L ->
Xapi_stdext_threads_scheduler.Scheduler.remove_from_queue
!Xapi_globs.job_for_disable_ssh
!Xapi_globs.job_for_disable_ssh ;
Db.Host.set_ssh_expiry ~__context ~self ~value:Date.epoch
| t ->
schedule_disable_ssh_job ~__context ~self ~timeout:t
) ;
Expand All @@ -3177,7 +3179,8 @@ let enable_ssh ~__context ~self =
with e ->
error "Failed to enable SSH on host %s: %s" (Ref.string_of self)
(Printexc.to_string e) ;
Helpers.internal_error "Failed to enable SSH: %s" (Printexc.to_string e)
Helpers.internal_error "Failed to enable SSH access, host: %s"
(Ref.string_of self)

let disable_ssh ~__context ~self =
Xapi_stdext_threads_scheduler.Scheduler.remove_from_queue
Expand Down
Loading