X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/72737a7f7641e4277401fe154e3d75b61623d013..cbfc468166d63c9f02f21018140df2558770ff9f:/lib/bootstrap.py diff --git a/lib/bootstrap.py b/lib/bootstrap.py index b69819a..b302d2c 100644 --- a/lib/bootstrap.py +++ b/lib/bootstrap.py @@ -38,8 +38,6 @@ from ganeti import constants from ganeti import objects from ganeti import ssconf -from ganeti.rpc import RpcRunner - def _InitSSHSetup(node): """Setup the SSH configuration for the cluster. @@ -79,13 +77,6 @@ def _InitGanetiServerSetup(): the cluster and also generates the SSL certificate. """ - # Create pseudo random password - randpass = utils.GenerateSecret() - - # and write it into the config file - utils.WriteFile(constants.CLUSTER_PASSWORD_FILE, - data="%s\n" % randpass, mode=0400) - result = utils.RunCmd(["openssl", "req", "-new", "-newkey", "rsa:1024", "-days", str(365*5), "-nodes", "-x509", "-keyout", constants.SSL_CERT_FILE, @@ -105,22 +96,20 @@ def _InitGanetiServerSetup(): (result.cmd, result.exit_code, result.output)) -def InitCluster(cluster_name, hypervisor_type, mac_prefix, def_bridge, - master_netdev, file_storage_dir, - secondary_ip=None, - vg_name=None): +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): """Initialise the cluster. + @type candidate_pool_size: int + @param candidate_pool_size: master candidate pool size + """ + # TODO: complete the docstring if config.ConfigWriter.IsCluster(): raise errors.OpPrereqError("Cluster is already initialised") - if hypervisor_type == constants.HT_XEN_HVM: - if not os.path.exists(constants.VNC_PASSWORD_FILE): - raise errors.OpPrereqError("Please prepare the cluster VNC" - "password file %s" % - constants.VNC_PASSWORD_FILE) - hostname = utils.HostInfo() if hostname.ip.startswith("127."): @@ -128,8 +117,7 @@ def InitCluster(cluster_name, hypervisor_type, mac_prefix, def_bridge, " range (%s). Please fix DNS or %s." % (hostname.ip, constants.ETC_HOSTS)) - if not utils.TcpPing(hostname.ip, constants.DEFAULT_NODED_PORT, - source=constants.LOCALHOST_IP_ADDRESS): + if not utils.OwnIpAddress(hostname.ip): raise errors.OpPrereqError("Inconsistency: this host's name resolves" " to %s,\nbut this ip address does not" " belong to this host." @@ -145,8 +133,7 @@ def InitCluster(cluster_name, hypervisor_type, mac_prefix, def_bridge, if not utils.IsValidIP(secondary_ip): raise errors.OpPrereqError("Invalid secondary ip given") if (secondary_ip != hostname.ip and - (not utils.TcpPing(secondary_ip, constants.DEFAULT_NODED_PORT, - source=constants.LOCALHOST_IP_ADDRESS))): + not utils.OwnIpAddress(secondary_ip)): raise errors.OpPrereqError("You gave %s as secondary IP," " but it does not belong to this host." % secondary_ip) @@ -182,10 +169,6 @@ def InitCluster(cluster_name, hypervisor_type, mac_prefix, def_bridge, 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) - if hypervisor_type not in constants.HYPER_TYPES: - raise errors.OpPrereqError("Invalid hypervisor type given '%s'" % - hypervisor_type) - result = utils.RunCmd(["ip", "link", "show", "dev", master_netdev]) if result.failed: raise errors.OpPrereqError("Invalid master netdev given (%s): '%s'" % @@ -197,6 +180,8 @@ def InitCluster(cluster_name, hypervisor_type, mac_prefix, def_bridge, raise errors.OpPrereqError("Init.d script '%s' missing or not" " executable." % constants.NODE_INITD_SCRIPT) + utils.CheckBEParams(beparams) + # set up the inter-node password and certificate _InitGanetiServerSetup() @@ -220,24 +205,34 @@ def InitCluster(cluster_name, hypervisor_type, mac_prefix, def_bridge, volume_group_name=vg_name, default_bridge=def_bridge, tcpudp_port_pool=set(), - hypervisor=hypervisor_type, master_node=hostname.name, master_ip=clustername.ip, master_netdev=master_netdev, cluster_name=clustername.name, file_storage_dir=file_storage_dir, + enabled_hypervisors=enabled_hypervisors, + default_hypervisor=default_hypervisor, + beparams={constants.BEGR_DEFAULT: beparams}, + hvparams=hvparams, + candidate_pool_size=candidate_pool_size, ) master_node_config = objects.Node(name=hostname.name, primary_ip=hostname.ip, - secondary_ip=secondary_ip) - - cfg = InitConfig(constants.CONFIG_VERSION, - cluster_config, master_node_config) - ssh.WriteKnownHostsFile(cfg, constants.SSH_KNOWN_HOSTS_FILE) + secondary_ip=secondary_ip, + serial_no=1, + master_candidate=True, + offline=False, + ) + + 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()) # start the master ip # TODO: Review rpc call from bootstrap - RpcRunner.call_node_start_master(hostname.name, True) + rpc.RpcRunner.call_node_start_master(hostname.name, True) def InitConfig(version, cluster_config, master_node_config, @@ -282,33 +277,28 @@ def FinalizeClusterDestroy(master): begun in cmdlib.LUDestroyOpcode. """ - if not RpcRunner.call_node_stop_master(master, True): + result = rpc.RpcRunner.call_node_stop_master(master, True) + if result.failed or not result.data: logging.warning("Could not disable the master role") - if not RpcRunner.call_node_leave_cluster(master): + 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") -def SetupNodeDaemon(node, ssh_key_check): +def SetupNodeDaemon(cluster_name, node, ssh_key_check): """Add a node to the cluster. This function must be called before the actual opcode, and will ssh to the remote node, copy the needed files, and start ganeti-noded, allowing the master to do the rest via normal rpc calls. - Args: - node: fully qualified domain name for the new node + @param cluster_name: the cluster name + @param node: the name of the new node + @param ssh_key_check: whether to do a strict key check """ - cfg = ssconf.SimpleConfigReader() - sshrunner = ssh.SshRunner(cfg.GetClusterName()) - gntpass = utils.GetNodeDaemonPassword() - if not re.match('^[a-zA-Z0-9.]{1,64}$', gntpass): - raise errors.OpExecError("ganeti password corruption detected") - f = open(constants.SSL_CERT_FILE) - try: - gntpem = f.read(8192) - finally: - f.close() + sshrunner = ssh.SshRunner(cluster_name) + gntpem = utils.ReadFile(constants.SSL_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 @@ -323,11 +313,9 @@ def SetupNodeDaemon(node, ssh_key_check): # note that all the below variables are sanitized at this point, # either by being constants or by the checks above mycommand = ("umask 077 && " - "echo '%s' > '%s' && " "cat > '%s' << '!EOF.' && \n" "%s!EOF.\n%s restart" % - (gntpass, constants.CLUSTER_PASSWORD_FILE, - constants.SSL_CERT_FILE, gntpem, + (constants.SSL_CERT_FILE, gntpem, constants.NODE_INITD_SCRIPT)) result = sshrunner.Run(node, 'root', mycommand, batch=False, @@ -339,8 +327,6 @@ def SetupNodeDaemon(node, ssh_key_check): " output: %s" % (node, result.fail_reason, result.output)) - return 0 - def MasterFailover(): """Failover the master node. @@ -350,39 +336,125 @@ def MasterFailover(): new master. """ - cfg = ssconf.SimpleConfigWriter() + sstore = ssconf.SimpleStore() - new_master = utils.HostInfo().name - old_master = cfg.GetMasterNode() + old_master, new_master = ssconf.GetMasterAndMyself(sstore) + node_list = sstore.GetNodeList() + mc_list = sstore.GetMasterCandidates() if old_master == new_master: 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) + + if new_master not in mc_list: + mc_no_master = [name for name in mc_list if name != old_master] + raise errors.OpPrereqError("This node is not among the nodes marked" + " as master candidates. Only these nodes" + " can become masters. Current list of" + " master candidates is:\n" + "%s" % ('\n'.join(mc_no_master))) + + vote_list = GatherMasterVotes(node_list) + + if vote_list: + voted_master = vote_list[0][0] + if voted_master is None: + raise errors.OpPrereqError("Cluster is inconsistent, most nodes did not" + " respond.") + elif voted_master != old_master: + raise errors.OpPrereqError("I have wrong configuration, I believe the" + " master is %s but the other nodes voted for" + " %s. Please resync the configuration of" + " this node." % (old_master, voted_master)) # end checks rcode = 0 - logging.info("setting master to %s, old master: %s", new_master, old_master) + logging.info("Setting master to %s, old master: %s", new_master, old_master) - if not RpcRunner.call_node_stop_master(old_master, True): - logging.error("could disable the master role on the old master" + result = rpc.RpcRunner.call_node_stop_master(old_master, True) + if result.failed or not result.data: + logging.error("Could not disable the master role on the old master" " %s, please disable manually", old_master) - cfg.SetMasterNode(new_master) - cfg.Save() - # Here we have a phase where no master should be running - if not RpcRunner.call_upload_file(cfg.GetNodeList(), - constants.CLUSTER_CONF_FILE): - logging.error("could not distribute the new simple store master file" - " to the other nodes, please check.") + # instantiate a real config writer, as we now know we have the + # configuration data + cfg = config.ConfigWriter() + + 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) - if not RpcRunner.call_node_start_master(new_master, True): - logging.error("could not start the master role on the new master" + result = rpc.RpcRunner.call_node_start_master(new_master, True) + if result.failed or not result.data: + logging.error("Could not start the master role on the new master" " %s, please check", new_master) rcode = 1 return rcode + + +def GatherMasterVotes(node_list): + """Check the agreement on who is the master. + + This function will return a list of (node, number of votes), ordered + by the number of votes. Errors will be denoted by the key 'None'. + + Note that the sum of votes is the number of nodes this machine + knows, whereas the number of entries in the list could be different + (if some nodes vote for another master). + + We remove ourselves from the list since we know that (bugs aside) + since we use the same source for configuration information for both + backend and boostrap, we'll always vote for ourselves. + + @type node_list: list + @param node_list: the list of nodes to query for master info; the current + node wil be removed if it is in the list + @rtype: list + @return: list of (node, votes) + + """ + myself = utils.HostInfo().name + try: + node_list.remove(myself) + except ValueError: + pass + if not node_list: + # no nodes left (eventually after removing myself) + return [] + results = rpc.RpcRunner.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") + return [(None, len(node_list))] + positive = negative = 0 + other_masters = {} + 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 + if None not in votes: + votes[None] = 0 + votes[None] += 1 + continue + master_node = data[2] + if master_node not in votes: + votes[master_node] = 0 + votes[master_node] += 1 + + vote_list = [v for v in votes.items()] + # sort first on number of votes then on name, since we want None + # sorted later if we have the half of the nodes not responding, and + # half voting all for the same master + vote_list.sort(key=lambda x: (x[1], x[0]), reverse=True) + + return vote_list