fixup! CA-395789: Add polling to cluster health state update

ocaml/xapi/xapi_clustering.ml

@@ -537,8 +537,8 @@ module Watcher = struct
 
  (* This is the time it takes for the update request to time out. It is ok to set
  it to a relatively long value since the call will return immediately if there
- is an update. Here we wait for 5 minutes *)
- let cluster_change_interval = Clock.Timer.s_to_span 300. |> Option.get
+ is an update. *)
+ let cluster_change_interval = Mtime.Span.(5 * min)
 
  let cluster_stack_watcher : bool Atomic.t = Atomic.make false
 
@@ -563,12 +563,13 @@ module Watcher = struct
  ()
  )
  | Error (InternalError "UPDATES.Timeout") -> (
- (* CA-395789: UPDATES.get timed out, this is normal. We send a query to
- xapi-clusterd to fetch the latest state anyway in case there is a race
- and the previous update did not give the most up-to-date information *)
+ (* UPDATES.get timed out, this is normal. *)
  match find_cluster_host ~__context ~host with
  | Some ch ->
  let cluster = Db.Cluster_host.get_cluster ~__context ~self:ch in
+ (* CA-395789: We send a query to xapi-clusterd to fetch the latest state
+ anyway in case there is a race and the previous update did not give the
+ most up-to-date information *)
  on_corosync_update ~__context ~cluster ["routine updates"]
  | None ->
  ()