Signed-off-by: Rok Strnisa <[email protected]>
ocaml/idl/api_errors.ml | 1 + ocaml/idl/datamodel.ml | 2 ++ ocaml/xapi/xapi.ml | 26 ++++++++++++++++---------- 3 files changed, 19 insertions(+), 10 deletions(-)
# HG changeset patch # User Rok Strnisa <[email protected]> # Date 1282643955 -3600 # Node ID f45a3d877beaf6f95464ce770f8d91e69210cec9 # Parent 8985c4ab79c7362e99a05626b6f15b36e8d1a866 Displays an accurate message when xapi fails to initialise when host is its own slave. Signed-off-by: Rok Strnisa <[email protected]> diff --git a/ocaml/idl/api_errors.ml b/ocaml/idl/api_errors.ml --- a/ocaml/idl/api_errors.ml +++ b/ocaml/idl/api_errors.ml @@ -64,6 +64,7 @@ let host_name_invalid = "HOST_NAME_INVAL let host_has_resident_vms = "HOST_HAS_RESIDENT_VMS" (* Host errors which explain why the host is in emergency mode *) +let host_its_own_slave = "HOST_ITS_OWN_SLAVE" let host_still_booting = "HOST_STILL_BOOTING" (* license *) let host_has_no_management_ip = "HOST_HAS_NO_MANAGEMENT_IP" diff --git a/ocaml/idl/datamodel.ml b/ocaml/idl/datamodel.ml --- a/ocaml/idl/datamodel.ml +++ b/ocaml/idl/datamodel.ml @@ -565,6 +565,8 @@ let _ = error Api_errors.host_power_on_mode_disabled [] ~doc:"This operation cannot be completed as the host power on mode is disabled." (); + error Api_errors.host_its_own_slave [] + ~doc:"The host is its own slave. Please use pool-emergency-transition-to-master or pool-emergency-reset-master." (); error Api_errors.host_still_booting [] ~doc:"The host is still booting." (); error Api_errors.host_has_no_management_ip [] diff --git a/ocaml/xapi/xapi.ml b/ocaml/xapi/xapi.ml --- a/ocaml/xapi/xapi.ml +++ b/ocaml/xapi/xapi.ml @@ -372,13 +372,19 @@ let bring_up_management_if ~__context () debug "Caught exception bringing up management interface: %s" (ExnHelper.string_of_exn e) (** When booting as a slave we must have a management IP address in order to talk to the master. *) -let wait_for_management_ip_address () = - debug "Attempting to acquire a management IP address"; - Xapi_host.set_emergency_mode_error Api_errors.host_has_no_management_ip []; - let ip = Xapi_mgmt_iface.wait_for_management_ip () in - debug "Acquired management IP address: %s" ip; - Xapi_host.set_emergency_mode_error Api_errors.host_still_booting []; - ip +let wait_for_management_ip_address () = + debug "Attempting to acquire a management IP address"; + Xapi_host.set_emergency_mode_error Api_errors.host_has_no_management_ip []; + let ip = Xapi_mgmt_iface.wait_for_management_ip () in + debug "Acquired management IP address: %s" ip; + Xapi_host.set_emergency_mode_error Api_errors.host_still_booting []; + (* Check whether I am my own slave. *) + let masters_ip = Pool_role.get_master_address () in + if masters_ip = "127.0.0.1" || masters_ip = ip then begin + debug "Realised that I am my own slave!"; + Xapi_host.set_emergency_mode_error Api_errors.host_its_own_slave []; + end; + ip type hello_error = | Permanent (* e.g. the pool secret is wrong i.e. wrong master *) @@ -818,14 +824,14 @@ let server_init() = (* Set emergency mode until we actually talk to the master *) Xapi_globs.slave_emergency_mode := true; (* signal the init script that it should succeed even though we're bust *) - Helpers.touch_file !Xapi_globs.ready_file; - + Helpers.touch_file !Xapi_globs.ready_file; + (* Keep trying to log into master *) let finished = ref false in while not(!finished) do (* Grab the management IP address (wait forever for it if necessary) *) let ip = wait_for_management_ip_address () in - + debug "Attempting to communicate with master"; (* Try to say hello to the pool *) begin match attempt_pool_hello ip with
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
