Skip to content

CA-416351: Slave shutdown timeout #6645

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −15
Open

CA-416351: Slave shutdown timeout #6645

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
23 changes: 11 additions & 12 deletions ocaml/xapi/xapi_hooks.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,22 +102,21 @@ let execute_hook ~__context ~script_name ~args ~reason =
)
scripts

let execute_vm_hook ~__context ~reason ~vm =
let vmuuid = Db.VM.get_uuid ~__context ~self:vm in
execute_hook ~__context ~args:["-vmuuid"; vmuuid] ~reason
let execute_vm_hook ~__context ~reason ~vm_uuid =
execute_hook ~__context ~args:["-vmuuid"; vm_uuid] ~reason

let execute_host_hook ~__context ~reason ~host =
let uuid = Db.Host.get_uuid ~__context ~self:host in
execute_hook ~__context ~args:["-hostuuid"; uuid] ~reason
let execute_host_hook ~__context ~reason ~host_uuid =
execute_hook ~__context ~args:["-hostuuid"; host_uuid] ~reason

let execute_pool_hook ~__context ~reason =
execute_hook ~__context ~args:[] ~reason

let host_pre_declare_dead ~__context ~host ~reason =
info "Running host pre declare dead hook for %s" (Ref.string_of host) ;
(* this could use power fencing *)
let host_uuid = Db.Host.get_uuid ~__context ~self:host in
execute_host_hook ~__context ~script_name:scriptname__host_pre_declare_dead
~reason ~host ;
~reason ~host_uuid ;
if String.equal reason reason__dbdestroy then
log_and_ignore_exn (fun () ->
(* declare it as dead to the clustering daemon if any *)
Expand All @@ -132,11 +131,10 @@ let host_pre_declare_dead ~__context ~host ~reason =
()
)

let xapi_pre_shutdown ~__context ~host ~reason =
info "%s Running xapi pre shutdown hooks for %s" __FUNCTION__
(Ref.string_of host) ;
let xapi_pre_shutdown ~__context ~host_uuid ~reason =
info "%s Running xapi pre shutdown hooks for %s" __FUNCTION__ host_uuid ;
execute_host_hook ~__context ~script_name:scriptname__xapi_pre_shutdown
~reason ~host
~reason ~host_uuid

(* Called when host died -- !! hook code in here to abort outstanding forwarded ops *)
let internal_host_dead_hook __context host =
Expand All @@ -159,8 +157,9 @@ let internal_host_dead_hook __context host =
let host_post_declare_dead ~__context ~host ~reason =
(* Cancel outstanding tasks first-- should release necessary locks *)
internal_host_dead_hook __context host ;
let host_uuid = Db.Host.get_uuid ~__context ~self:host in
execute_host_hook ~__context ~script_name:scriptname__host_post_declare_dead
~reason ~host
~reason ~host_uuid

let pool_ha_overcommitted_hook ~__context =
execute_pool_hook ~__context ~script_name:scriptname__pool_ha_overcommitted
Expand Down
6 changes: 3 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 @@ -793,9 +793,9 @@ let restart_agent ~__context ~host:_ =
)

let shutdown_agent ~__context =
debug "Host.restart_agent: Host agent will shutdown in 1s!!!!" ;
let localhost = Helpers.get_localhost ~__context in
Xapi_hooks.xapi_pre_shutdown ~__context ~host:localhost
debug "Host.shutdown_agent: Host agent will shutdown in 1s!!!!" ;
let host_uuid = Helpers.get_localhost_uuid () in
Xapi_hooks.xapi_pre_shutdown ~__context ~host_uuid
~reason:Xapi_hooks.reason__clean_shutdown ;
Xapi_fuse.light_fuse_and_dont_restart ~fuse_length:1. ()

Expand Down
Loading