Skip to content

Commit

Permalink
CP-49634: Add alerting for Corosync upgrade
Browse files Browse the repository at this point in the history
Xapi will send alert when the user is running on a Corosync 2 cluster
and prompting them to upgrade. This should only happen on XS 9 and is
behind the corosync3 feature flag.

XenCenter can take advantage of this alert message, but should have its
own warning message to tell the user why/how to perform the upgrade.

Signed-off-by: Vincent Liu <[email protected]>
  • Loading branch information
Vincent-lau committed Jul 16, 2024
1 parent 69768f5 commit 6577325
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 3 deletions.
2 changes: 2 additions & 0 deletions ocaml/xapi-consts/api_messages.ml
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,8 @@ let cluster_host_leaving = addMessage "CLUSTER_HOST_LEAVING" 3L

let cluster_host_joining = addMessage "CLUSTER_HOST_JOINING" 4L

let cluster_stack_out_of_date = addMessage "CLUSTER_STACK_OUT_OF_DATE" 3L

(* Certificate expiration messages *)
let host_server_certificate_expiring = "HOST_SERVER_CERTIFICATE_EXPIRING"

Expand Down
62 changes: 59 additions & 3 deletions ocaml/xapi/xapi_clustering.ml
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,8 @@ module Watcher = struct
is an update *)
let cluster_change_interval = Mtime.Span.min

let cluster_stack_watcher : bool Atomic.t = Atomic.make false

(* we handle unclean hosts join and leave in the watcher, i.e. hosts joining and leaving
due to network problems, power cut, etc. Join and leave initiated by the
API will be handled in the API call themselves, but they share the same code
Expand Down Expand Up @@ -573,22 +575,76 @@ module Watcher = struct
done ;
Atomic.set cluster_change_watcher false

let watch_cluster_stack_version ~__context ~host =
if !Daemon.enabled then
match find_cluster_host ~__context ~host with
| Some ch ->
let cluster_ref = Db.Cluster_host.get_cluster ~__context ~self:ch in
let cluster_rec =
Db.Cluster.get_record ~__context ~self:cluster_ref
in
if
Cluster_stack.of_version
( cluster_rec.API.cluster_cluster_stack
, cluster_rec.API.cluster_cluster_stack_version
)
= Cluster_stack.Corosync2
then (
debug "%s: Detected Corosync 2 running as cluster stack"
__FUNCTION__ ;
let body =
"The current cluster stack version of Corosync 2 is out of date, \
consider updating to Corosync 3"
in
let name, priority = Api_messages.cluster_stack_out_of_date in
let host_uuid = Db.Host.get_uuid ~__context ~self:host in

Helpers.call_api_functions ~__context (fun rpc session_id ->
let _ : [> `message] Ref.t =
Client.Client.Message.create ~rpc ~session_id ~name ~priority
~cls:`Host ~obj_uuid:host_uuid ~body
in
()
)
)
| None ->
debug "%s: No cluster host, no need to watch" __FUNCTION__

(** [create_as_necessary] will create cluster watchers on the coordinator if they are not
already created.
There is no need to destroy them: once the clustering daemon is disabled,
these threads will exit as well. *)
let create_as_necessary ~__context ~host =
if Helpers.is_pool_master ~__context ~host then
if Helpers.is_pool_master ~__context ~host then (
if Xapi_cluster_helpers.cluster_health_enabled ~__context then
if Atomic.compare_and_set cluster_change_watcher false true then (
debug "%s: create watcher for corosync-notifyd on coordinator"
__FUNCTION__ ;
ignore
@@ Thread.create (fun () -> watch_cluster_change ~__context ~host) ()
let _ : Thread.t =
Thread.create (fun () -> watch_cluster_change ~__context ~host) ()
in
()
) else
(* someone else must have gone into the if branch above and created the thread
before us, leave it to them *)
debug
"%s: not create watcher for corosync-notifyd as it already exists"
__FUNCTION__ ;

if Xapi_cluster_helpers.corosync3_enabled ~__context then
if Atomic.compare_and_set cluster_stack_watcher false true then (
debug
"%s: create cluster stack watcher for out-of-date cluster stack \
(corosync2)"
__FUNCTION__ ;
let _ : Thread.t =
Thread.create
(fun () -> watch_cluster_stack_version ~__context ~host)
()
in
()
) else
debug "%s: not create watcher for cluster stack as it already exists"
__FUNCTION__
)
end

0 comments on commit 6577325

Please sign in to comment.