X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/7845b8c85fbf53d61d4006d2a84b58585b3b695e..b8203e1ee4e63032355b287e50527a5fdc91dbd5:/lib/bootstrap.py diff --git a/lib/bootstrap.py b/lib/bootstrap.py index 11e1f6e..8c4663f 100644 --- a/lib/bootstrap.py +++ b/lib/bootstrap.py @@ -1,7 +1,7 @@ # # -# Copyright (C) 2006, 2007, 2008, 2010 Google Inc. +# Copyright (C) 2006, 2007, 2008, 2010, 2011, 2012 Google Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,6 +42,15 @@ from ganeti import hypervisor from ganeti import bdev from ganeti import netutils from ganeti import backend +from ganeti import luxi +from ganeti import jstore + + +# ec_id for InitConfig's temporary reservation manager +_INITCONF_ECID = "initconfig-ecid" + +#: After how many seconds daemon must be responsive +_DAEMON_READY_TIMEOUT = 10.0 def _InitSSHSetup(): @@ -79,10 +88,14 @@ def GenerateHmacKey(file_name): backup=True) -def GenerateClusterCrypto(new_cluster_cert, new_rapi_cert, new_confd_hmac_key, - new_cds, rapi_cert_pem=None, cds=None, +def GenerateClusterCrypto(new_cluster_cert, new_rapi_cert, new_spice_cert, + new_confd_hmac_key, new_cds, + rapi_cert_pem=None, spice_cert_pem=None, + spice_cacert_pem=None, cds=None, nodecert_file=constants.NODED_CERT_FILE, rapicert_file=constants.RAPI_CERT_FILE, + spicecert_file=constants.SPICE_CERT_FILE, + spicecacert_file=constants.SPICE_CACERT_FILE, hmackey_file=constants.CONFD_HMAC_KEY, cds_file=constants.CLUSTER_DOMAIN_SECRET_FILE): """Updates the cluster certificates, keys and secrets. @@ -91,18 +104,29 @@ def GenerateClusterCrypto(new_cluster_cert, new_rapi_cert, new_confd_hmac_key, @param new_cluster_cert: Whether to generate a new cluster certificate @type new_rapi_cert: bool @param new_rapi_cert: Whether to generate a new RAPI certificate + @type new_spice_cert: bool + @param new_spice_cert: Whether to generate a new SPICE certificate @type new_confd_hmac_key: bool @param new_confd_hmac_key: Whether to generate a new HMAC key @type new_cds: bool @param new_cds: Whether to generate a new cluster domain secret @type rapi_cert_pem: string @param rapi_cert_pem: New RAPI certificate in PEM format + @type spice_cert_pem: string + @param spice_cert_pem: New SPICE certificate in PEM format + @type spice_cacert_pem: string + @param spice_cacert_pem: Certificate of the CA that signed the SPICE + certificate, in PEM format @type cds: string @param cds: New cluster domain secret @type nodecert_file: string @param nodecert_file: optional override of the node cert file path @type rapicert_file: string @param rapicert_file: optional override of the rapi cert file path + @type spicecert_file: string + @param spicecert_file: optional override of the spice cert file path + @type spicecacert_file: string + @param spicecacert_file: optional override of the spice CA cert file path @type hmackey_file: string @param hmackey_file: optional override of the hmac key file path @@ -136,6 +160,31 @@ def GenerateClusterCrypto(new_cluster_cert, new_rapi_cert, new_confd_hmac_key, logging.debug("Generating new RAPI certificate at %s", rapicert_file) utils.GenerateSelfSignedSslCert(rapicert_file) + # SPICE + spice_cert_exists = os.path.exists(spicecert_file) + spice_cacert_exists = os.path.exists(spicecacert_file) + if spice_cert_pem: + # spice_cert_pem implies also spice_cacert_pem + logging.debug("Writing SPICE certificate at %s", spicecert_file) + utils.WriteFile(spicecert_file, data=spice_cert_pem, backup=True) + logging.debug("Writing SPICE CA certificate at %s", spicecacert_file) + utils.WriteFile(spicecacert_file, data=spice_cacert_pem, backup=True) + elif new_spice_cert or not spice_cert_exists: + if spice_cert_exists: + utils.CreateBackup(spicecert_file) + if spice_cacert_exists: + utils.CreateBackup(spicecacert_file) + + logging.debug("Generating new self-signed SPICE certificate at %s", + spicecert_file) + (_, cert_pem) = utils.GenerateSelfSignedSslCert(spicecert_file) + + # Self-signed certificate -> the public certificate is also the CA public + # certificate + logging.debug("Writing the public certificate to %s", + spicecert_file) + utils.io.WriteFile(spicecacert_file, mode=0400, data=cert_pem) + # Cluster domain secret if cds: logging.debug("Writing cluster domain secret to %s", cds_file) @@ -157,7 +206,7 @@ def _InitGanetiServerSetup(master_name): """ # Generate cluster secrets - GenerateClusterCrypto(True, False, False, False) + GenerateClusterCrypto(True, False, False, False, False) result = utils.RunCmd([constants.DAEMON_UTIL, "start", constants.NODED]) if result.failed: @@ -173,15 +222,35 @@ def _WaitForNodeDaemon(node_name): """ def _CheckNodeDaemon(): - result = rpc.RpcRunner.call_version([node_name])[node_name] + result = rpc.BootstrapRunner().call_version([node_name])[node_name] if result.fail_msg: raise utils.RetryAgain() try: - utils.Retry(_CheckNodeDaemon, 1.0, 10.0) + utils.Retry(_CheckNodeDaemon, 1.0, _DAEMON_READY_TIMEOUT) except utils.RetryTimeout: raise errors.OpExecError("Node daemon on %s didn't answer queries within" - " 10 seconds" % node_name) + " %s seconds" % (node_name, _DAEMON_READY_TIMEOUT)) + + +def _WaitForMasterDaemon(): + """Wait for master daemon to become responsive. + + """ + def _CheckMasterDaemon(): + try: + cl = luxi.Client() + (cluster_name, ) = cl.QueryConfigValues(["cluster_name"]) + except Exception: + raise utils.RetryAgain() + + logging.debug("Received cluster name %s from master", cluster_name) + + try: + utils.Retry(_CheckMasterDaemon, 1.0, _DAEMON_READY_TIMEOUT) + except utils.RetryTimeout: + raise errors.OpExecError("Master daemon didn't answer queries within" + " %s seconds" % _DAEMON_READY_TIMEOUT) def _InitFileStorage(file_storage_dir): @@ -192,14 +261,11 @@ def _InitFileStorage(file_storage_dir): time) or the normalized path to the storage directory """ - if not constants.ENABLE_FILE_STORAGE: - return "" - file_storage_dir = os.path.normpath(file_storage_dir) if not os.path.isabs(file_storage_dir): - raise errors.OpPrereqError("The file storage directory you passed is" - " not an absolute path.", errors.ECODE_INVAL) + raise errors.OpPrereqError("File storage directory '%s' is not an absolute" + " path" % file_storage_dir, errors.ECODE_INVAL) if not os.path.exists(file_storage_dir): try: @@ -216,14 +282,16 @@ def _InitFileStorage(file_storage_dir): return file_storage_dir -#pylint: disable-msg=R0913 -def InitCluster(cluster_name, mac_prefix, - master_netdev, file_storage_dir, candidate_pool_size, - secondary_ip=None, vg_name=None, beparams=None, - nicparams=None, hvparams=None, enabled_hypervisors=None, +def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913, R0914 + master_netmask, master_netdev, file_storage_dir, + shared_file_storage_dir, candidate_pool_size, secondary_ip=None, + vg_name=None, beparams=None, nicparams=None, ndparams=None, + hvparams=None, diskparams=None, enabled_hypervisors=None, modify_etc_hosts=True, modify_ssh_setup=True, - maintain_node_health=False, drbd_helper=None, - uid_pool=None, default_iallocator=None): + maintain_node_health=False, drbd_helper=None, uid_pool=None, + default_iallocator=None, primary_ip_version=None, ipolicy=None, + prealloc_wipe_disks=False, use_external_mip_script=False, + hv_state=None, disk_state=None): """Initialise the cluster. @type candidate_pool_size: int @@ -244,39 +312,59 @@ def InitCluster(cluster_name, mac_prefix, " entries: %s" % invalid_hvs, errors.ECODE_INVAL) - hostname = netutils.GetHostname() + try: + ipcls = netutils.IPAddress.GetClassFromIpVersion(primary_ip_version) + except errors.ProgrammerError: + raise errors.OpPrereqError("Invalid primary ip version: %d." % + primary_ip_version) + + hostname = netutils.GetHostname(family=ipcls.family) + if not ipcls.IsValid(hostname.ip): + raise errors.OpPrereqError("This host's IP (%s) is not a valid IPv%d" + " address." % (hostname.ip, primary_ip_version)) - if netutils.IP4Address.IsLoopback(hostname.ip): + if ipcls.IsLoopback(hostname.ip): raise errors.OpPrereqError("This host's IP (%s) resolves to a loopback" " address. Please fix DNS or %s." % (hostname.ip, constants.ETC_HOSTS), errors.ECODE_ENVIRON) - if not netutils.IPAddress.Own(hostname.ip): + if not ipcls.Own(hostname.ip): raise errors.OpPrereqError("Inconsistency: this host's name resolves" " to %s,\nbut this ip address does not" - " belong to this host. Aborting." % + " belong to this host" % hostname.ip, errors.ECODE_ENVIRON) - clustername = netutils.GetHostname(name=cluster_name) + clustername = netutils.GetHostname(name=cluster_name, family=ipcls.family) - if netutils.TcpPing(clustername.ip, constants.DEFAULT_NODED_PORT, - timeout=5): - raise errors.OpPrereqError("Cluster IP already active. Aborting.", + if netutils.TcpPing(clustername.ip, constants.DEFAULT_NODED_PORT, timeout=5): + raise errors.OpPrereqError("Cluster IP already active", errors.ECODE_NOTUNIQUE) - if secondary_ip: - if not netutils.IP4Address.IsValid(secondary_ip): - raise errors.OpPrereqError("Invalid secondary ip given", + if not secondary_ip: + if primary_ip_version == constants.IP6_VERSION: + raise errors.OpPrereqError("When using a IPv6 primary address, a valid" + " IPv4 address must be given as secondary", errors.ECODE_INVAL) - if (secondary_ip != hostname.ip and - not netutils.IPAddress.Own(secondary_ip)): - raise errors.OpPrereqError("You gave %s as secondary IP," - " but it does not belong to this host." % - secondary_ip, errors.ECODE_ENVIRON) - else: secondary_ip = hostname.ip + if not netutils.IP4Address.IsValid(secondary_ip): + raise errors.OpPrereqError("Secondary IP address (%s) has to be a valid" + " IPv4 address." % secondary_ip, + errors.ECODE_INVAL) + + if not netutils.IP4Address.Own(secondary_ip): + raise errors.OpPrereqError("You gave %s as secondary IP," + " but it does not belong to this host." % + secondary_ip, errors.ECODE_ENVIRON) + + if master_netmask is not None: + if not ipcls.ValidateNetmask(master_netmask): + raise errors.OpPrereqError("CIDR netmask (%s) not valid for IPv%s " % + (master_netmask, primary_ip_version)) + else: + master_netmask = ipcls.iplen + if vg_name is not None: # Check if volume group is valid vgstatus = utils.CheckVolumeGroupSize(utils.ListVolumeGroups(), vg_name, @@ -300,7 +388,15 @@ def InitCluster(cluster_name, mac_prefix, curr_helper), errors.ECODE_INVAL) - file_storage_dir = _InitFileStorage(file_storage_dir) + if constants.ENABLE_FILE_STORAGE: + file_storage_dir = _InitFileStorage(file_storage_dir) + else: + file_storage_dir = "" + + if constants.ENABLE_SHARED_FILE_STORAGE: + shared_file_storage_dir = _InitFileStorage(shared_file_storage_dir) + else: + shared_file_storage_dir = "" if not re.match("^[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}$", mac_prefix): raise errors.OpPrereqError("Invalid mac prefix given '%s'" % mac_prefix, @@ -315,22 +411,63 @@ def InitCluster(cluster_name, mac_prefix, dirs = [(constants.RUN_GANETI_DIR, constants.RUN_DIRS_MODE)] utils.EnsureDirs(dirs) + objects.UpgradeBeParams(beparams) utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) + objects.NIC.CheckParameterSyntax(nicparams) + full_ipolicy = objects.FillIPolicy(constants.IPOLICY_DEFAULTS, ipolicy) + + if ndparams is not None: + utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES) + else: + ndparams = dict(constants.NDC_DEFAULTS) + + # This is ugly, as we modify the dict itself + # FIXME: Make utils.ForceDictType pure functional or write a wrapper + # around it + if hv_state: + for hvname, hvs_data in hv_state.items(): + utils.ForceDictType(hvs_data, constants.HVSTS_PARAMETER_TYPES) + hv_state[hvname] = objects.Cluster.SimpleFillHvState(hvs_data) + else: + hv_state = dict((hvname, constants.HVST_DEFAULTS) + for hvname in enabled_hypervisors) + + # FIXME: disk_state has no default values yet + if disk_state: + for storage, ds_data in disk_state.items(): + if storage not in constants.DS_VALID_TYPES: + raise errors.OpPrereqError("Invalid storage type in disk state: %s" % + storage, errors.ECODE_INVAL) + for ds_name, state in ds_data.items(): + utils.ForceDictType(state, constants.DSS_PARAMETER_TYPES) + ds_data[ds_name] = objects.Cluster.SimpleFillDiskState(state) + # hvparams is a mapping of hypervisor->hvparams dict for hv_name, hv_params in hvparams.iteritems(): utils.ForceDictType(hv_params, constants.HVS_PARAMETER_TYPES) hv_class = hypervisor.GetHypervisor(hv_name) hv_class.CheckParameterSyntax(hv_params) + # diskparams is a mapping of disk-template->diskparams dict + for template, dt_params in diskparams.items(): + param_keys = set(dt_params.keys()) + default_param_keys = set(constants.DISK_DT_DEFAULTS[template].keys()) + if not (param_keys <= default_param_keys): + unknown_params = param_keys - default_param_keys + raise errors.OpPrereqError("Invalid parameters for disk template %s:" + " %s" % (template, + utils.CommaJoin(unknown_params))) + utils.ForceDictType(dt_params, constants.DISK_DT_TYPES) + # set up ssh config and /etc/hosts sshline = utils.ReadFile(constants.SSH_HOST_RSA_PUB) sshkey = sshline.split(" ")[1] if modify_etc_hosts: - utils.AddHostToEtcHosts(hostname.name) + utils.AddHostToEtcHosts(hostname.name, hostname.ip) if modify_ssh_setup: _InitSSHSetup() @@ -343,6 +480,12 @@ def InitCluster(cluster_name, mac_prefix, raise errors.OpPrereqError("Invalid default iallocator script '%s'" " specified" % default_iallocator, errors.ECODE_INVAL) + elif constants.HTOOLS: + # htools was enabled at build-time, we default to it + if utils.FindFile(constants.IALLOC_HAIL, + constants.IALLOCATOR_SEARCH_PATH, + os.path.isfile): + default_iallocator = constants.IALLOC_HAIL now = time.time() @@ -356,23 +499,32 @@ def InitCluster(cluster_name, mac_prefix, tcpudp_port_pool=set(), master_node=hostname.name, master_ip=clustername.ip, + master_netmask=master_netmask, master_netdev=master_netdev, cluster_name=clustername.name, file_storage_dir=file_storage_dir, + shared_file_storage_dir=shared_file_storage_dir, enabled_hypervisors=enabled_hypervisors, beparams={constants.PP_DEFAULT: beparams}, nicparams={constants.PP_DEFAULT: nicparams}, + ndparams=ndparams, hvparams=hvparams, + diskparams=diskparams, candidate_pool_size=candidate_pool_size, modify_etc_hosts=modify_etc_hosts, modify_ssh_setup=modify_ssh_setup, uid_pool=uid_pool, ctime=now, mtime=now, - uuid=utils.NewUUID(), maintain_node_health=maintain_node_health, drbd_usermode_helper=drbd_helper, default_iallocator=default_iallocator, + primary_ip_family=ipcls.family, + prealloc_wipe_disks=prealloc_wipe_disks, + use_external_mip_script=use_external_mip_script, + ipolicy=full_ipolicy, + hv_state_static=hv_state, + disk_state_static=disk_state, ) master_node_config = objects.Node(name=hostname.name, primary_ip=hostname.ip, @@ -380,6 +532,7 @@ def InitCluster(cluster_name, mac_prefix, serial_no=1, master_candidate=True, offline=False, drained=False, + ctime=now, mtime=now, ) InitConfig(constants.CONFIG_VERSION, cluster_config, master_node_config) cfg = config.ConfigWriter(offline=True) @@ -390,10 +543,14 @@ def InitCluster(cluster_name, mac_prefix, # set up the inter-node password and certificate _InitGanetiServerSetup(hostname.name) - # start the master ip - # TODO: Review rpc call from bootstrap - # TODO: Warn on failed start master - rpc.RpcRunner.call_node_start_master(hostname.name, True, False) + logging.debug("Starting daemons") + result = utils.RunCmd([constants.DAEMON_UTIL, "start-all"]) + if result.failed: + raise errors.OpExecError("Could not start daemons, command %s" + " had exitcode %s and error %s" % + (result.cmd, result.exit_code, result.output)) + + _WaitForMasterDaemon() def InitConfig(version, cluster_config, master_node_config, @@ -413,13 +570,27 @@ def InitConfig(version, cluster_config, master_node_config, @param cfg_file: configuration file path """ + uuid_generator = config.TemporaryReservationManager() + cluster_config.uuid = uuid_generator.Generate([], utils.NewUUID, + _INITCONF_ECID) + master_node_config.uuid = uuid_generator.Generate([], utils.NewUUID, + _INITCONF_ECID) nodes = { master_node_config.name: master_node_config, } - + default_nodegroup = objects.NodeGroup( + uuid=uuid_generator.Generate([], utils.NewUUID, _INITCONF_ECID), + name=constants.INITIAL_NODE_GROUP_NAME, + members=[master_node_config.name], + diskparams=cluster_config.diskparams, + ) + nodegroups = { + default_nodegroup.uuid: default_nodegroup, + } now = time.time() config_data = objects.ConfigData(version=version, cluster=cluster_config, + nodegroups=nodegroups, nodes=nodes, instances={}, serial_no=1, @@ -438,11 +609,24 @@ def FinalizeClusterDestroy(master): """ cfg = config.ConfigWriter() modify_ssh_setup = cfg.GetClusterInfo().modify_ssh_setup - result = rpc.RpcRunner.call_node_stop_master(master, True) + runner = rpc.BootstrapRunner() + + master_params = cfg.GetMasterNetworkParameters() + master_params.name = master + ems = cfg.GetUseExternalMipScript() + result = runner.call_node_deactivate_master_ip(master_params.name, + master_params, ems) + + msg = result.fail_msg + if msg: + logging.warning("Could not disable the master IP: %s", msg) + + result = runner.call_node_stop_master(master) msg = result.fail_msg if msg: logging.warning("Could not disable the master role: %s", msg) - result = rpc.RpcRunner.call_node_leave_cluster(master, modify_ssh_setup) + + result = runner.call_node_leave_cluster(master, modify_ssh_setup) msg = result.fail_msg if msg: logging.warning("Could not shutdown the node daemon and cleanup" @@ -461,52 +645,30 @@ def SetupNodeDaemon(cluster_name, node, ssh_key_check): @param ssh_key_check: whether to do a strict key check """ - sshrunner = ssh.SshRunner(cluster_name) - - noded_cert = utils.ReadFile(constants.NODED_CERT_FILE) - rapi_cert = utils.ReadFile(constants.RAPI_CERT_FILE) - confd_hmac_key = utils.ReadFile(constants.CONFD_HMAC_KEY) - - # in the base64 pem encoding, neither '!' nor '.' are valid chars, - # so we use this to detect an invalid certificate; as long as the - # cert doesn't contain this, the here-document will be correctly - # parsed by the shell sequence below. HMAC keys are hexadecimal strings, - # so the same restrictions apply. - for content in (noded_cert, rapi_cert, confd_hmac_key): - if re.search('^!EOF\.', content, re.MULTILINE): - raise errors.OpExecError("invalid SSL certificate or HMAC key") - - if not noded_cert.endswith("\n"): - noded_cert += "\n" - if not rapi_cert.endswith("\n"): - rapi_cert += "\n" - if not confd_hmac_key.endswith("\n"): - confd_hmac_key += "\n" + family = ssconf.SimpleStore().GetPrimaryIPFamily() + sshrunner = ssh.SshRunner(cluster_name, + ipv6=(family == netutils.IP6Address.family)) + + bind_address = constants.IP4_ADDRESS_ANY + if family == netutils.IP6Address.family: + bind_address = constants.IP6_ADDRESS_ANY # set up inter-node password and certificate and restarts the node daemon # and then connect with ssh to set password and start ganeti-noded # note that all the below variables are sanitized at this point, # either by being constants or by the checks above - # TODO: Could this command exceed a shell's maximum command length? - mycommand = ("umask 077 && " - "cat > '%s' << '!EOF.' && \n" - "%s!EOF.\n" - "cat > '%s' << '!EOF.' && \n" - "%s!EOF.\n" - "cat > '%s' << '!EOF.' && \n" - "%s!EOF.\n" - "chmod 0400 %s %s %s && " - "%s start %s" % - (constants.NODED_CERT_FILE, noded_cert, - constants.RAPI_CERT_FILE, rapi_cert, - constants.CONFD_HMAC_KEY, confd_hmac_key, - constants.NODED_CERT_FILE, constants.RAPI_CERT_FILE, - constants.CONFD_HMAC_KEY, - constants.DAEMON_UTIL, constants.NODED)) - - result = sshrunner.Run(node, 'root', mycommand, batch=False, + sshrunner.CopyFileToNode(node, constants.NODED_CERT_FILE) + sshrunner.CopyFileToNode(node, constants.RAPI_CERT_FILE) + sshrunner.CopyFileToNode(node, constants.SPICE_CERT_FILE) + sshrunner.CopyFileToNode(node, constants.SPICE_CACERT_FILE) + sshrunner.CopyFileToNode(node, constants.CONFD_HMAC_KEY) + mycommand = ("%s stop-all; %s start %s -b %s" % + (constants.DAEMON_UTIL, constants.DAEMON_UTIL, constants.NODED, + utils.ShellQuote(bind_address))) + + result = sshrunner.Run(node, "root", mycommand, batch=False, ask_key=ssh_key_check, - use_cluster_key=False, + use_cluster_key=True, strict_host_check=ssh_key_check) if result.failed: raise errors.OpExecError("Remote command on node %s, error: %s," @@ -546,7 +708,7 @@ def MasterFailover(no_voting=False): " as master candidates. Only these nodes" " can become masters. Current list of" " master candidates is:\n" - "%s" % ('\n'.join(mc_no_master)), + "%s" % ("\n".join(mc_no_master)), errors.ECODE_STATE) if not no_voting: @@ -570,14 +732,50 @@ def MasterFailover(no_voting=False): logging.info("Setting master to %s, old master: %s", new_master, old_master) - result = rpc.RpcRunner.call_node_stop_master(old_master, True) + try: + # instantiate a real config writer, as we now know we have the + # configuration data + cfg = config.ConfigWriter(accept_foreign=True) + + cluster_info = cfg.GetClusterInfo() + cluster_info.master_node = new_master + # this will also regenerate the ssconf files, since we updated the + # cluster info + cfg.Update(cluster_info, logging.error) + except errors.ConfigurationError, err: + logging.error("Error while trying to set the new master: %s", + str(err)) + return 1 + + # if cfg.Update worked, then it means the old master daemon won't be + # able now to write its own config file (we rely on locking in both + # backend.UploadFile() and ConfigWriter._Write(); hence the next + # step is to kill the old master + + logging.info("Stopping the master daemon on node %s", old_master) + + runner = rpc.BootstrapRunner() + master_params = cfg.GetMasterNetworkParameters() + master_params.name = old_master + ems = cfg.GetUseExternalMipScript() + result = runner.call_node_deactivate_master_ip(master_params.name, + master_params, ems) + + msg = result.fail_msg + if msg: + logging.warning("Could not disable the master IP: %s", msg) + + result = runner.call_node_stop_master(old_master) msg = result.fail_msg if msg: logging.error("Could not disable the master role on the old master" " %s, please disable manually: %s", old_master, msg) + logging.info("Checking master IP non-reachability...") + master_ip = sstore.GetMasterIP() total_timeout = 30 + # Here we have a phase where no master should be running def _check_ip(): if netutils.TcpPing(master_ip, constants.DEFAULT_NODED_PORT): @@ -590,23 +788,21 @@ def MasterFailover(no_voting=False): " continuing but activating the master on the current" " node will probably fail", total_timeout) - # instantiate a real config writer, as we now know we have the - # configuration data - cfg = config.ConfigWriter() + if jstore.CheckDrainFlag(): + logging.info("Undraining job queue") + jstore.SetDrainFlag(False) - cluster_info = cfg.GetClusterInfo() - cluster_info.master_node = new_master - # this will also regenerate the ssconf files, since we updated the - # cluster info - cfg.Update(cluster_info, logging.error) + logging.info("Starting the master daemons on the new master") - result = rpc.RpcRunner.call_node_start_master(new_master, True, no_voting) + result = rpc.BootstrapRunner().call_node_start_master_daemons(new_master, + no_voting) msg = result.fail_msg if msg: logging.error("Could not start the master role on the new master" " %s, please check: %s", new_master, msg) rcode = 1 + logging.info("Master failed over from %s to %s", old_master, new_master) return rcode @@ -655,7 +851,7 @@ def GatherMasterVotes(node_list): if not node_list: # no nodes left (eventually after removing myself) return [] - results = rpc.RpcRunner.call_master_info(node_list) + results = rpc.BootstrapRunner().call_master_info(node_list) if not isinstance(results, dict): # this should not happen (unless internal error in rpc) logging.critical("Can't complete rpc call, aborting master startup") @@ -669,6 +865,8 @@ def GatherMasterVotes(node_list): if msg: logging.warning("Error contacting node %s: %s", node, msg) fail = True + # for now we accept both length 3, 4 and 5 (data[3] is primary ip version + # and data[4] is the master netmask) elif not isinstance(data, (tuple, list)) or len(data) < 3: logging.warning("Invalid data received from node %s: %s", node, data) fail = True