X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/485ba21243b587df12e6a36bf48f5970ceeeecdb..678aa6d3c75709d1a0e99ad1fcefb81dc53f9a5e:/lib/config.py diff --git a/lib/config.py b/lib/config.py index e81e563..2cab4ca 100644 --- a/lib/config.py +++ b/lib/config.py @@ -67,10 +67,7 @@ def _ValidateConfig(data): """ if data.version != constants.CONFIG_VERSION: - raise errors.ConfigurationError("Cluster configuration version" - " mismatch, got %s instead of %s" % - (data.version, - constants.CONFIG_VERSION)) + raise errors.ConfigVersionMismatch(constants.CONFIG_VERSION, data.version) class TemporaryReservationManager: @@ -84,15 +81,15 @@ class TemporaryReservationManager: self._ec_reserved = {} def Reserved(self, resource): - for holder_reserved in self._ec_reserved.items(): + for holder_reserved in self._ec_reserved.values(): if resource in holder_reserved: return True return False def Reserve(self, ec_id, resource): if self.Reserved(resource): - raise errors.ReservationError("Duplicate reservation for resource: %s." % - (resource)) + raise errors.ReservationError("Duplicate reservation for resource '%s'" + % str(resource)) if ec_id not in self._ec_reserved: self._ec_reserved[ec_id] = set([resource]) else: @@ -135,7 +132,8 @@ class ConfigWriter: @ivar _all_rms: a list of all temporary reservation managers """ - def __init__(self, cfg_file=None, offline=False, _getents=runtime.GetEnts): + def __init__(self, cfg_file=None, offline=False, _getents=runtime.GetEnts, + accept_foreign=False): self.write_count = 0 self._lock = _config_lock self._config_data = None @@ -158,7 +156,8 @@ class ConfigWriter: # file than after it was modified self._my_hostname = netutils.Hostname.GetSysName() self._last_cluster_serial = -1 - self._OpenConfig() + self._cfg_id = None + self._OpenConfig(accept_foreign) # this method needs to be static, so that we can call it on the class @staticmethod @@ -458,7 +457,7 @@ class ConfigWriter: if [node.master_candidate, node.drained, node.offline].count(True) > 1: result.append("Node %s state is invalid: master_candidate=%s," " drain=%s, offline=%s" % - (node.name, node.master_candidate, node.drain, + (node.name, node.master_candidate, node.drained, node.offline)) # nodegroups checks @@ -855,12 +854,12 @@ class ConfigWriter: @locking.ssynchronized(_config_lock, shared=1) def LookupNodeGroup(self, target): - """Lookup a node group. + """Lookup a node group's UUID. @type target: string or None - @param target: group name or uuid or None to look for the default + @param target: group name or UUID or None to look for the default @rtype: string - @return: nodegroup uuid + @return: nodegroup UUID @raises errors.OpPrereqError: when the target group cannot be found """ @@ -875,7 +874,36 @@ class ConfigWriter: for nodegroup in self._config_data.nodegroups.values(): if nodegroup.name == target: return nodegroup.uuid - raise errors.OpPrereqError("Nodegroup '%s' not found", target) + raise errors.OpPrereqError("Nodegroup '%s' not found" % target) + + @locking.ssynchronized(_config_lock, shared=1) + def GetNodeGroup(self, uuid): + """Lookup a node group. + + @type uuid: string + @param uuid: group UUID + @rtype: L{objects.NodeGroup} or None + @return: nodegroup object, or None if not found + + """ + if uuid not in self._config_data.nodegroups: + return None + + return self._config_data.nodegroups[uuid] + + @locking.ssynchronized(_config_lock, shared=1) + def GetAllNodeGroupsInfo(self): + """Get the configuration of all node groups. + + """ + return dict(self._config_data.nodegroups) + + @locking.ssynchronized(_config_lock, shared=1) + def GetNodeGroupList(self): + """Get a list of node groups. + + """ + return self._config_data.nodegroups.keys() @locking.ssynchronized(_config_lock) def AddInstance(self, instance, ec_id): @@ -977,10 +1005,14 @@ class ConfigWriter: if disk.dev_type == constants.LD_FILE: # rename the file paths in logical and physical id file_storage_dir = os.path.dirname(os.path.dirname(disk.logical_id[1])) + disk_fname = "disk%s" % disk.iv_name.split("/")[1] disk.physical_id = disk.logical_id = (disk.logical_id[0], utils.PathJoin(file_storage_dir, inst.name, - disk.iv_name)) + disk_fname)) + + # Force update of ssconf files + self._config_data.cluster.serial_no += 1 self._config_data.instances[inst.name] = inst self._WriteConfig() @@ -1073,7 +1105,7 @@ class ConfigWriter: node.serial_no = 1 node.ctime = node.mtime = time.time() - self._UnlockedAddNodeToGroup(node.name, node.nodegroup) + self._UnlockedAddNodeToGroup(node.name, node.group) self._config_data.nodes[node.name] = node self._config_data.cluster.serial_no += 1 self._WriteConfig() @@ -1133,6 +1165,25 @@ class ConfigWriter: """ return self._UnlockedGetNodeInfo(node_name) + @locking.ssynchronized(_config_lock, shared=1) + def GetNodeInstances(self, node_name): + """Get the instances of a node, as stored in the config. + + @param node_name: the node name, e.g. I{node1.example.com} + + @rtype: (list, list) + @return: a tuple with two lists: the primary and the secondary instances + + """ + pri = [] + sec = [] + for inst in self._config_data.instances.values(): + if inst.primary_node == node_name: + pri.append(inst.name) + if node_name in inst.secondary_nodes: + sec.append(inst.name) + return (pri, sec) + def _UnlockedGetNodeList(self): """Return the list of nodes which are in the configuration. @@ -1167,6 +1218,15 @@ class ConfigWriter: return self._UnlockedGetOnlineNodeList() @locking.ssynchronized(_config_lock, shared=1) + def GetNonVmCapableNodeList(self): + """Return the list of nodes which are not vm capable. + + """ + all_nodes = [self._UnlockedGetNodeInfo(node) + for node in self._UnlockedGetNodeList()] + return [node.name for node in all_nodes if not node.vm_capable] + + @locking.ssynchronized(_config_lock, shared=1) def GetAllNodesInfo(self): """Get the configuration of all nodes. @@ -1192,7 +1252,7 @@ class ConfigWriter: for node in self._config_data.nodes.values(): if exceptions and node.name in exceptions: continue - if not (node.offline or node.drained): + if not (node.offline or node.drained) and node.master_capable: mc_max += 1 if node.master_candidate: mc_now += 1 @@ -1233,7 +1293,7 @@ class ConfigWriter: break node = self._config_data.nodes[name] if (node.master_candidate or node.offline or node.drained or - node.name in exceptions): + node.name in exceptions or not node.master_capable): continue mod_list.append(node) node.master_candidate = True @@ -1258,7 +1318,7 @@ class ConfigWriter: # when we're adding the first node to it, since we don't keep a lock in # the meantime. It's ok though, as we'll fail cleanly if the node group # is not found anymore. - raise errors.OpExecError("Unknown nodegroup: %s" % nodegroup_uuid) + raise errors.OpExecError("Unknown node group: %s" % nodegroup_uuid) if node_name not in self._config_data.nodegroups[nodegroup_uuid].members: self._config_data.nodegroups[nodegroup_uuid].members.append(node_name) @@ -1266,13 +1326,13 @@ class ConfigWriter: """Remove a given node from its group. """ - nodegroup = node.nodegroup + nodegroup = node.group if nodegroup not in self._config_data.nodegroups: - logging.warning("Warning: node '%s' has a non-existing nodegroup '%s'" + logging.warning("Warning: node '%s' has unknown node group '%s'" " (while being removed from it)", node.name, nodegroup) nodegroup_obj = self._config_data.nodegroups[nodegroup] if node.name not in nodegroup_obj.members: - logging.warning("Warning: node '%s' not a member of its nodegroup '%s'" + logging.warning("Warning: node '%s' not a member of its node group '%s'" " (while being removed from it)", node.name, nodegroup) else: nodegroup_obj.members.remove(node.name) @@ -1293,7 +1353,7 @@ class ConfigWriter: self._config_data.nodegroups.values() + [self._config_data.cluster]) - def _OpenConfig(self): + def _OpenConfig(self, accept_foreign): """Read the config data from disk. """ @@ -1312,6 +1372,13 @@ class ConfigWriter: raise errors.ConfigurationError("Incomplete configuration" " (missing cluster.rsahostkeypub)") + if data.cluster.master_node != self._my_hostname and not accept_foreign: + msg = ("The configuration denotes node %s as master, while my" + " hostname is %s; opening a foreign configuration is only" + " possible in accept_foreign mode" % + (data.cluster.master_node, self._my_hostname)) + raise errors.ConfigurationError(msg) + # Upgrade configuration if needed data.UpgradeConfig() @@ -1323,6 +1390,8 @@ class ConfigWriter: # And finally run our (custom) config upgrade sequence self._UpgradeConfig() + self._cfg_id = utils.GetFileID(path=self._cfg_file) + def _UpgradeConfig(self): """Run upgrade steps that cannot be done purely in the objects. @@ -1351,14 +1420,14 @@ class ConfigWriter: self._config_data.nodegroups[default_nodegroup_uuid] = default_nodegroup modified = True for node in self._config_data.nodes.values(): - if not node.nodegroup: - node.nodegroup = self.LookupNodeGroup(None) + if not node.group: + node.group = self.LookupNodeGroup(None) modified = True # This is technically *not* an upgrade, but needs to be done both when # nodegroups are being added, and upon normally loading the config, # because the members list of a node group is discarded upon # serializing/deserializing the object. - self._UnlockedAddNodeToGroup(node.name, node.nodegroup) + self._UnlockedAddNodeToGroup(node.name, node.group) if modified: self._WriteConfig() # This is ok even if it acquires the internal lock, as _UpgradeConfig is @@ -1433,7 +1502,17 @@ class ConfigWriter: txt = serializer.Dump(self._config_data.ToDict()) getents = self._getents() - utils.WriteFile(destination, data=txt, gid=getents.confd_gid, mode=0640) + try: + fd = utils.SafeWriteFile(destination, self._cfg_id, data=txt, + close=False, gid=getents.confd_gid, mode=0640) + except errors.LockError: + raise errors.ConfigurationError("The configuration file has been" + " modified since the last write, cannot" + " update") + try: + self._cfg_id = utils.GetFileID(fd=fd) + finally: + os.close(fd) self.write_count += 1