X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/fba159433fcfd5b19d9cb6f755253a2d27dab4a8..34fbc862d21452efd70338b6c8495b3af0513f29:/lib/bootstrap.py diff --git a/lib/bootstrap.py b/lib/bootstrap.py index 18db894..85c2251 100644 --- a/lib/bootstrap.py +++ b/lib/bootstrap.py @@ -1,7 +1,7 @@ # # -# Copyright (C) 2006, 2007, 2008 Google Inc. +# Copyright (C) 2006, 2007, 2008, 2010, 2011 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 @@ -27,7 +27,7 @@ import os import os.path import re import logging -import tempfile +import time from ganeti import rpc from ganeti import ssh @@ -37,7 +37,20 @@ from ganeti import config from ganeti import constants from ganeti import objects from ganeti import ssconf +from ganeti import serializer 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(): @@ -61,72 +74,222 @@ def _InitSSHSetup(): raise errors.OpExecError("Could not generate ssh keypair, error %s" % result.output) - f = open(pub_key, 'r') - try: - utils.AddAuthorizedKey(auth_keys, f.read(8192)) - finally: - f.close() + utils.AddAuthorizedKey(auth_keys, utils.ReadFile(pub_key)) -def _GenerateSelfSignedSslCert(file_name, validity=(365 * 5)): - """Generates a self-signed SSL certificate. +def GenerateHmacKey(file_name): + """Writes a new HMAC key. @type file_name: str @param file_name: Path to output file - @type validity: int - @param validity: Validity for certificate in days """ - (fd, tmp_file_name) = tempfile.mkstemp(dir=os.path.dirname(file_name)) - try: - try: - # Set permissions before writing key - os.chmod(tmp_file_name, 0600) + utils.WriteFile(file_name, data="%s\n" % utils.GenerateSecret(), mode=0400, + backup=True) + + +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. + + @type new_cluster_cert: bool + @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 - result = utils.RunCmd(["openssl", "req", "-new", "-newkey", "rsa:1024", - "-days", str(validity), "-nodes", "-x509", - "-keyout", tmp_file_name, "-out", tmp_file_name, - "-batch"]) - if result.failed: - raise errors.OpExecError("Could not generate SSL certificate, command" - " %s had exitcode %s and error message %s" % - (result.cmd, result.exit_code, result.output)) - - # Make read-only - os.chmod(tmp_file_name, 0400) - - os.rename(tmp_file_name, file_name) - finally: - utils.RemoveFile(tmp_file_name) - finally: - os.close(fd) - - -def _InitGanetiServerSetup(): + """ + # noded SSL certificate + cluster_cert_exists = os.path.exists(nodecert_file) + if new_cluster_cert or not cluster_cert_exists: + if cluster_cert_exists: + utils.CreateBackup(nodecert_file) + + logging.debug("Generating new cluster certificate at %s", nodecert_file) + utils.GenerateSelfSignedSslCert(nodecert_file) + + # confd HMAC key + if new_confd_hmac_key or not os.path.exists(hmackey_file): + logging.debug("Writing new confd HMAC key to %s", hmackey_file) + GenerateHmacKey(hmackey_file) + + # RAPI + rapi_cert_exists = os.path.exists(rapicert_file) + + if rapi_cert_pem: + # Assume rapi_pem contains a valid PEM-formatted certificate and key + logging.debug("Writing RAPI certificate at %s", rapicert_file) + utils.WriteFile(rapicert_file, data=rapi_cert_pem, backup=True) + + elif new_rapi_cert or not rapi_cert_exists: + if rapi_cert_exists: + utils.CreateBackup(rapicert_file) + + 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) + utils.WriteFile(cds_file, data=cds, backup=True) + + elif new_cds or not os.path.exists(cds_file): + logging.debug("Generating new cluster domain secret at %s", cds_file) + GenerateHmacKey(cds_file) + + +def _InitGanetiServerSetup(master_name): """Setup the necessary configuration for the initial node daemon. This creates the nodepass file containing the shared password for - the cluster and also generates the SSL certificate. + the cluster, generates the SSL certificate and starts the node daemon. - """ - _GenerateSelfSignedSslCert(constants.SSL_CERT_FILE) + @type master_name: str + @param master_name: Name of the master node - # Don't overwrite existing file - if not os.path.exists(constants.RAPI_CERT_FILE): - _GenerateSelfSignedSslCert(constants.RAPI_CERT_FILE) - - result = utils.RunCmd([constants.NODE_INITD_SCRIPT, "restart"]) + """ + # Generate cluster secrets + GenerateClusterCrypto(True, False, False, False, False) + result = utils.RunCmd([constants.DAEMON_UTIL, "start", constants.NODED]) if result.failed: raise errors.OpExecError("Could not start the node daemon, command %s" " had exitcode %s and error %s" % (result.cmd, result.exit_code, result.output)) + _WaitForNodeDaemon(master_name) + + +def _WaitForNodeDaemon(node_name): + """Wait for node daemon to become responsive. + + """ + def _CheckNodeDaemon(): + result = rpc.RpcRunner.call_version([node_name])[node_name] + if result.fail_msg: + raise utils.RetryAgain() + + try: + utils.Retry(_CheckNodeDaemon, 1.0, _DAEMON_READY_TIMEOUT) + except utils.RetryTimeout: + raise errors.OpExecError("Node daemon on %s didn't answer queries within" + " %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 InitCluster(cluster_name, mac_prefix, def_bridge, - master_netdev, file_storage_dir, candidate_pool_size, - secondary_ip=None, vg_name=None, beparams=None, hvparams=None, - enabled_hypervisors=None, default_hypervisor=None): +def _InitFileStorage(file_storage_dir): + """Initialize if needed the file storage. + + @param file_storage_dir: the user-supplied value + @return: either empty string (if file storage was disabled at build + time) or the normalized path to the storage directory + + """ + file_storage_dir = os.path.normpath(file_storage_dir) + + if not os.path.isabs(file_storage_dir): + 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: + os.makedirs(file_storage_dir, 0750) + except OSError, err: + raise errors.OpPrereqError("Cannot create file storage directory" + " '%s': %s" % (file_storage_dir, err), + errors.ECODE_ENVIRON) + + if not os.path.isdir(file_storage_dir): + raise errors.OpPrereqError("The file storage directory '%s' is not" + " a directory." % file_storage_dir, + errors.ECODE_ENVIRON) + return file_storage_dir + + +def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913 + 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, + enabled_hypervisors=None, modify_etc_hosts=True, + modify_ssh_setup=True, maintain_node_health=False, + drbd_helper=None, uid_pool=None, default_iallocator=None, + primary_ip_version=None, prealloc_wipe_disks=False): """Initialise the cluster. @type candidate_pool_size: int @@ -135,101 +298,154 @@ def InitCluster(cluster_name, mac_prefix, def_bridge, """ # TODO: complete the docstring if config.ConfigWriter.IsCluster(): - raise errors.OpPrereqError("Cluster is already initialised") + raise errors.OpPrereqError("Cluster is already initialised", + errors.ECODE_STATE) + + if not enabled_hypervisors: + raise errors.OpPrereqError("Enabled hypervisors list must contain at" + " least one member", errors.ECODE_INVAL) + invalid_hvs = set(enabled_hypervisors) - constants.HYPER_TYPES + if invalid_hvs: + raise errors.OpPrereqError("Enabled hypervisors contains invalid" + " entries: %s" % invalid_hvs, + errors.ECODE_INVAL) + + ipcls = None + if primary_ip_version == constants.IP4_VERSION: + ipcls = netutils.IP4Address + elif primary_ip_version == constants.IP6_VERSION: + ipcls = netutils.IP6Address + else: + raise errors.OpPrereqError("Invalid primary ip version: %d." % + primary_ip_version) - hostname = utils.HostInfo() + 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 hostname.ip.startswith("127."): - raise errors.OpPrereqError("This host's IP resolves to the private" - " range (%s). Please fix DNS or %s." % - (hostname.ip, constants.ETC_HOSTS)) + 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 utils.OwnIpAddress(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." % hostname.ip) - - clustername = utils.HostInfo(cluster_name) - - if utils.TcpPing(clustername.ip, constants.DEFAULT_NODED_PORT, - timeout=5): - raise errors.OpPrereqError("Cluster IP already active. Aborting.") - - if secondary_ip: - if not utils.IsValidIP(secondary_ip): - raise errors.OpPrereqError("Invalid secondary ip given") - if (secondary_ip != hostname.ip and - not utils.OwnIpAddress(secondary_ip)): - raise errors.OpPrereqError("You gave %s as secondary IP," - " but it does not belong to this host." % - secondary_ip) - else: + " belong to this host" % + hostname.ip, errors.ECODE_ENVIRON) + + 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", + errors.ECODE_NOTUNIQUE) + + 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) 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 vg_name is not None: # Check if volume group is valid vgstatus = utils.CheckVolumeGroupSize(utils.ListVolumeGroups(), vg_name, constants.MIN_VG_SIZE) if vgstatus: raise errors.OpPrereqError("Error: %s\nspecify --no-lvm-storage if" - " you are not using lvm" % vgstatus) - - 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.") + " you are not using lvm" % vgstatus, + errors.ECODE_INVAL) - if not os.path.exists(file_storage_dir): + if drbd_helper is not None: try: - os.makedirs(file_storage_dir, 0750) - except OSError, err: - raise errors.OpPrereqError("Cannot create file storage directory" - " '%s': %s" % - (file_storage_dir, err)) + curr_helper = bdev.BaseDRBD.GetUsermodeHelper() + except errors.BlockDeviceError, err: + raise errors.OpPrereqError("Error while checking drbd helper" + " (specify --no-drbd-storage if you are not" + " using drbd): %s" % str(err), + errors.ECODE_ENVIRON) + if drbd_helper != curr_helper: + raise errors.OpPrereqError("Error: requiring %s as drbd helper but %s" + " is the current helper" % (drbd_helper, + curr_helper), + errors.ECODE_INVAL) + + if constants.ENABLE_FILE_STORAGE: + file_storage_dir = _InitFileStorage(file_storage_dir) + else: + file_storage_dir = "" - if not os.path.isdir(file_storage_dir): - raise errors.OpPrereqError("The file storage directory '%s' is not" - " a directory." % 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) + raise errors.OpPrereqError("Invalid mac prefix given '%s'" % mac_prefix, + errors.ECODE_INVAL) result = utils.RunCmd(["ip", "link", "show", "dev", master_netdev]) if result.failed: raise errors.OpPrereqError("Invalid master netdev given (%s): '%s'" % (master_netdev, - result.output.strip())) - - if not (os.path.isfile(constants.NODE_INITD_SCRIPT) and - os.access(constants.NODE_INITD_SCRIPT, os.X_OK)): - raise errors.OpPrereqError("Init.d script '%s' missing or not" - " executable." % constants.NODE_INITD_SCRIPT) + result.output.strip()), errors.ECODE_INVAL) dirs = [(constants.RUN_GANETI_DIR, constants.RUN_DIRS_MODE)] utils.EnsureDirs(dirs) utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) + utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) + objects.NIC.CheckParameterSyntax(nicparams) + + if ndparams is not None: + utils.ForceDictType(ndparams, constants.NDS_PARAMETER_TYPES) + else: + ndparams = dict(constants.NDC_DEFAULTS) + # 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) - # set up the inter-node password and certificate - _InitGanetiServerSetup() - # set up ssh config and /etc/hosts - f = open(constants.SSH_HOST_RSA_PUB, 'r') - try: - sshline = f.read() - finally: - f.close() + sshline = utils.ReadFile(constants.SSH_HOST_RSA_PUB) sshkey = sshline.split(" ")[1] - utils.AddHostToEtcHosts(hostname.name) - _InitSSHSetup() + if modify_etc_hosts: + utils.AddHostToEtcHosts(hostname.name, hostname.ip) + + if modify_ssh_setup: + _InitSSHSetup() + + if default_iallocator is not None: + alloc_script = utils.FindFile(default_iallocator, + constants.IALLOCATOR_SEARCH_PATH, + os.path.isfile) + if alloc_script is None: + 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() # init of cluster config file cluster_config = objects.Cluster( @@ -238,18 +454,29 @@ def InitCluster(cluster_name, mac_prefix, def_bridge, highest_used_port=(constants.FIRST_DRBD_PORT - 1), mac_prefix=mac_prefix, volume_group_name=vg_name, - default_bridge=def_bridge, tcpudp_port_pool=set(), master_node=hostname.name, master_ip=clustername.ip, 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, - default_hypervisor=default_hypervisor, - beparams={constants.BEGR_DEFAULT: beparams}, + beparams={constants.PP_DEFAULT: beparams}, + nicparams={constants.PP_DEFAULT: nicparams}, + ndparams=ndparams, hvparams=hvparams, 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, + 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, ) master_node_config = objects.Node(name=hostname.name, primary_ip=hostname.ip, @@ -257,17 +484,25 @@ def InitCluster(cluster_name, mac_prefix, def_bridge, 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) + ssh.WriteKnownHostsFile(cfg, constants.SSH_KNOWN_HOSTS_FILE) + cfg.Update(cfg.GetClusterInfo(), logging.error) + backend.WriteSsconfFiles(cfg.GetSsconfValues()) - sscfg = InitConfig(constants.CONFIG_VERSION, - cluster_config, master_node_config) - ssh.WriteKnownHostsFile(sscfg, constants.SSH_KNOWN_HOSTS_FILE) - cfg = config.ConfigWriter() - cfg.Update(cfg.GetClusterInfo()) + # set up the inter-node password and certificate + _InitGanetiServerSetup(hostname.name) + + 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)) - # start the master ip - # TODO: Review rpc call from bootstrap - rpc.RpcRunner.call_node_start_master(hostname.name, True) + _WaitForMasterDaemon() def InitConfig(version, cluster_config, master_node_config, @@ -286,23 +521,34 @@ def InitConfig(version, cluster_config, master_node_config, @type cfg_file: string @param cfg_file: configuration file path - @rtype: L{ssconf.SimpleConfigWriter} - @return: initialized config instance - """ + 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], + ) + 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) - cfg = ssconf.SimpleConfigWriter.FromDict(config_data.ToDict(), cfg_file) - cfg.Save() - - return cfg + serial_no=1, + ctime=now, mtime=now) + utils.WriteFile(cfg_file, + data=serializer.Dump(config_data.ToDict()), + mode=0600) def FinalizeClusterDestroy(master): @@ -312,12 +558,17 @@ def FinalizeClusterDestroy(master): begun in cmdlib.LUDestroyOpcode. """ + cfg = config.ConfigWriter() + modify_ssh_setup = cfg.GetClusterInfo().modify_ssh_setup result = rpc.RpcRunner.call_node_stop_master(master, True) - if result.failed or not result.data: - logging.warning("Could not disable the master role") - result = rpc.RpcRunner.call_node_leave_cluster(master) - if result.failed or not result.data: - logging.warning("Could not shutdown the node daemon and cleanup the node") + 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) + msg = result.fail_msg + if msg: + logging.warning("Could not shutdown the node daemon and cleanup" + " the node: %s", msg) def SetupNodeDaemon(cluster_name, node, ssh_key_check): @@ -332,49 +583,38 @@ 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.SSL_CERT_FILE) - rapi_cert = utils.ReadFile(constants.RAPI_CERT_FILE) - - # 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 - if (re.search('^!EOF\.', noded_cert, re.MULTILINE) or - re.search('^!EOF\.', rapi_cert, re.MULTILINE)): - raise errors.OpExecError("invalid PEM encoding in the SSL certificate") + family = ssconf.SimpleStore().GetPrimaryIPFamily() + sshrunner = ssh.SshRunner(cluster_name, + ipv6=(family == netutils.IP6Address.family)) - if not noded_cert.endswith("\n"): - noded_cert += "\n" - if not rapi_cert.endswith("\n"): - rapi_cert += "\n" + 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 - mycommand = ("umask 077 && " - "cat > '%s' << '!EOF.' && \n" - "%s!EOF.\n" - "cat > '%s' << '!EOF.' && \n" - "%s!EOF.\n" - "chmod 0400 %s %s && " - "%s restart" % - (constants.SSL_CERT_FILE, noded_cert, - constants.RAPI_CERT_FILE, rapi_cert, - constants.SSL_CERT_FILE, constants.RAPI_CERT_FILE, - constants.NODE_INITD_SCRIPT)) + 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," " output: %s" % (node, result.fail_reason, result.output)) + _WaitForNodeDaemon(node) + def MasterFailover(no_voting=False): """Failover the master node. @@ -398,7 +638,7 @@ def MasterFailover(no_voting=False): raise errors.OpPrereqError("This commands must be run on the node" " where you want the new master to be." " %s is already the master" % - old_master) + old_master, errors.ECODE_INVAL) if new_master not in mc_list: mc_no_master = [name for name in mc_list if name != old_master] @@ -406,7 +646,8 @@ 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: vote_list = GatherMasterVotes(node_list) @@ -415,43 +656,79 @@ def MasterFailover(no_voting=False): voted_master = vote_list[0][0] if voted_master is None: raise errors.OpPrereqError("Cluster is inconsistent, most nodes did" - " not respond.") + " not respond.", errors.ECODE_ENVIRON) elif voted_master != old_master: raise errors.OpPrereqError("I have a wrong configuration, I believe" " the master is %s but the other nodes" " voted %s. Please resync the configuration" " of this node." % - (old_master, voted_master)) + (old_master, voted_master), + errors.ECODE_STATE) # end checks rcode = 0 logging.info("Setting master to %s, old master: %s", new_master, old_master) + 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) + result = rpc.RpcRunner.call_node_stop_master(old_master, True) - if result.failed or not result.data: + msg = result.fail_msg + if msg: logging.error("Could not disable the master role on the old master" - " %s, please disable manually", 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): + raise utils.RetryAgain() - # instantiate a real config writer, as we now know we have the - # configuration data - cfg = config.ConfigWriter() + try: + utils.Retry(_check_ip, (1, 1.5, 5), total_timeout) + except utils.RetryTimeout: + logging.warning("The master IP is still reachable after %s seconds," + " continuing but activating the master on the current" + " node will probably fail", total_timeout) + + 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.info("Starting the master daemons on the new master") - # 2.0.X: Don't start the master if no_voting is true - result = rpc.RpcRunner.call_node_start_master(new_master, not no_voting) - if result.failed or not result.data: + result = rpc.RpcRunner.call_node_start_master(new_master, True, no_voting) + msg = result.fail_msg + if msg: logging.error("Could not start the master role on the new master" - " %s, please check", 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 @@ -492,7 +769,7 @@ def GatherMasterVotes(node_list): @return: list of (node, votes) """ - myself = utils.HostInfo().name + myself = netutils.Hostname.GetSysName() try: node_list.remove(myself) except ValueError: @@ -508,9 +785,17 @@ def GatherMasterVotes(node_list): votes = {} for node in results: nres = results[node] - data = nres.data - if nres.failed or not isinstance(data, (tuple, list)) or len(data) < 3: - # here the rpc layer should have already logged errors + data = nres.payload + msg = nres.fail_msg + fail = False + if msg: + logging.warning("Error contacting node %s: %s", node, msg) + fail = True + # for now we accept both length 3 and 4 (data[3] is primary ip version) + elif not isinstance(data, (tuple, list)) or len(data) < 3: + logging.warning("Invalid data received from node %s: %s", node, data) + fail = True + if fail: if None not in votes: votes[None] = 0 votes[None] += 1