Skip to content

Fix problems with "xe pool-designate-new-master" #32

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
2 commits merged into from
Feb 23, 2011
Merged

Fix problems with "xe pool-designate-new-master" #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a74f1d9
CA-49854: only call Pool.sync_database on the pool master because onl…
Feb 23, 2011
b1b8aec
CA-49854: retry "permanent" db failures after 1 minute, so that desig…
Feb 23, 2011
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
2 changes: 1 addition & 1 deletion ocaml/xapi/xapi_globs.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ let old_hp_bios_strings =
"hp-rombios", "COMPAQ"]


let permanent_master_failure_retry_timeout = 5. *. 60. (* 5 minutes *)
let permanent_master_failure_retry_timeout = 1. *. 60. (* 1 minute *)

(** {2 CPUID feature masking} *)

Expand Down
6 changes: 5 additions & 1 deletion ocaml/xapi/xapi_pool.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,11 @@ let designate_new_master ~__context ~host =
if Db.Pool.get_ha_enabled ~__context ~self:pool
then raise (Api_errors.Server_error(Api_errors.ha_is_enabled, []));

sync_database ~__context;
(* Only the master can sync the *current* database; only the master
knows the current generation count etc. *)
Helpers.call_api_functions ~__context
(fun rpc session_id ->
Client.Pool.sync_database rpc session_id);

let all_hosts = Db.Host.get_all ~__context in
(* We make no attempt to demand a quorum or anything. *)
Expand Down