"""
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:
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:
@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
# 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
return mac
@locking.ssynchronized(_config_lock, shared=1)
+ def GetNdParams(self, node):
+ """Get the node params populated with cluster defaults.
+
+ @type node: L{object.Node}
+ @param node: The node we want to know the params for
+ @return: A dict with the filled in node params
+
+ """
+ nodegroup = self._UnlockedGetNodeGroup(node.group)
+ return self._config_data.cluster.FillND(node, nodegroup)
+
+ @locking.ssynchronized(_config_lock, shared=1)
def GenerateMAC(self, ec_id):
"""Generate a MAC for an instance.
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
+ nodegroups_names = set()
for nodegroup_uuid in data.nodegroups:
nodegroup = data.nodegroups[nodegroup_uuid]
if nodegroup.uuid != nodegroup_uuid:
- result.append("nodegroup '%s' (uuid: '%s') indexed by wrong uuid '%s'"
+ result.append("node group '%s' (uuid: '%s') indexed by wrong uuid '%s'"
% (nodegroup.name, nodegroup.uuid, nodegroup_uuid))
+ if utils.UUID_RE.match(nodegroup.name.lower()):
+ result.append("node group '%s' (uuid: '%s') has uuid-like name" %
+ (nodegroup.name, nodegroup.uuid))
+ if nodegroup.name in nodegroups_names:
+ result.append("duplicate node group name '%s'" % nodegroup.name)
+ else:
+ nodegroups_names.add(nodegroup.name)
# drbd minors check
_, duplicates = self._UnlockedComputeDRBDMap()
"""
return self._config_data.cluster.primary_ip_family
+ @locking.ssynchronized(_config_lock)
+ def AddNodeGroup(self, group, ec_id, check_uuid=True):
+ """Add a node group to the configuration.
+
+ This method calls group.UpgradeConfig() to fill any missing attributes
+ according to their default values.
+
+ @type group: L{objects.NodeGroup}
+ @param group: the NodeGroup object to add
+ @type ec_id: string
+ @param ec_id: unique id for the job to use when creating a missing UUID
+ @type check_uuid: bool
+ @param check_uuid: add an UUID to the group if it doesn't have one or, if
+ it does, ensure that it does not exist in the
+ configuration already
+
+ """
+ self._UnlockedAddNodeGroup(group, ec_id, check_uuid)
+ self._WriteConfig()
+
+ def _UnlockedAddNodeGroup(self, group, ec_id, check_uuid):
+ """Add a node group to the configuration.
+
+ """
+ logging.info("Adding node group %s to configuration", group.name)
+
+ # Some code might need to add a node group with a pre-populated UUID
+ # generated with ConfigWriter.GenerateUniqueID(). We allow them to bypass
+ # the "does this UUID" exist already check.
+ if check_uuid:
+ self._EnsureUUID(group, ec_id)
+
+ group.serial_no = 1
+ group.ctime = group.mtime = time.time()
+ group.UpgradeConfig()
+
+ self._config_data.nodegroups[group.uuid] = group
+ self._config_data.cluster.serial_no += 1
+
+ @locking.ssynchronized(_config_lock)
+ def RemoveNodeGroup(self, group_uuid):
+ """Remove a node group from the configuration.
+
+ @type group_uuid: string
+ @param group_uuid: the UUID of the node group to remove
+
+ """
+ logging.info("Removing node group %s from configuration", group_uuid)
+
+ if group_uuid not in self._config_data.nodegroups:
+ raise errors.ConfigurationError("Unknown node group '%s'" % group_uuid)
+
+ del self._config_data.nodegroups[group_uuid]
+ self._config_data.cluster.serial_no += 1
+ self._WriteConfig()
+
@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
"""
if target is None:
if len(self._config_data.nodegroups) != 1:
- raise errors.OpPrereqError("More than one nodegroup exists. Target"
+ raise errors.OpPrereqError("More than one node group exists. Target"
" group must be specified explicitely.")
else:
return self._config_data.nodegroups.keys()[0]
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("Node group '%s' not found" % target,
+ errors.ECODE_NOENT)
+
+ def _UnlockedGetNodeGroup(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 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
+
+ """
+ return self._UnlockedGetNodeGroup(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):
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()
node.serial_no = 1
node.ctime = node.mtime = time.time()
+ self._UnlockedAddNodeToGroup(node.name, node.group)
self._config_data.nodes[node.name] = node
self._config_data.cluster.serial_no += 1
self._WriteConfig()
if node_name not in self._config_data.nodes:
raise errors.ConfigurationError("Unknown node '%s'" % node_name)
+ self._UnlockedRemoveNodeFromGroup(self._config_data.nodes[node_name])
del self._config_data.nodes[node_name]
self._config_data.cluster.serial_no += 1
self._WriteConfig()
"""
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.
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.
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
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
return mod_list
+ def _UnlockedAddNodeToGroup(self, node_name, nodegroup_uuid):
+ """Add a given node to the specified group.
+
+ """
+ if nodegroup_uuid not in self._config_data.nodegroups:
+ # This can happen if a node group gets deleted between its lookup and
+ # 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 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)
+
+ def _UnlockedRemoveNodeFromGroup(self, node):
+ """Remove a given node from its group.
+
+ """
+ nodegroup = node.group
+ if nodegroup not in self._config_data.nodegroups:
+ 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 node group '%s'"
+ " (while being removed from it)", node.name, nodegroup)
+ else:
+ nodegroup_obj.members.remove(node.name)
+
def _BumpSerialNo(self):
"""Bump up the serial number of the config.
self._config_data.nodegroups.values() +
[self._config_data.cluster])
- def _OpenConfig(self):
+ def _OpenConfig(self, accept_foreign):
"""Read the config data from disk.
"""
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()
# 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.
item.uuid = self._GenerateUniqueID(_UPGRADE_CONFIG_JID)
modified = True
if not self._config_data.nodegroups:
- default_nodegroup_uuid = self._GenerateUniqueID(_UPGRADE_CONFIG_JID)
- default_nodegroup = objects.NodeGroup(
- uuid=default_nodegroup_uuid,
- name="default",
- members=[],
- )
- self._config_data.nodegroups[default_nodegroup_uuid] = default_nodegroup
+ default_nodegroup_name = constants.INITIAL_NODE_GROUP_NAME
+ default_nodegroup = objects.NodeGroup(name=default_nodegroup_name,
+ members=[])
+ self._UnlockedAddNodeGroup(default_nodegroup, _UPGRADE_CONFIG_JID, True)
modified = True
+ for node in self._config_data.nodes.values():
+ 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.group)
if modified:
self._WriteConfig()
# This is ok even if it acquires the internal lock, as _UpgradeConfig is
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
uid_pool = uidpool.FormatUidPool(cluster.uid_pool, separator="\n")
+ nodegroups = ["%s %s" % (nodegroup.uuid, nodegroup.name) for nodegroup in
+ self._config_data.nodegroups.values()]
+ nodegroups_data = fn(utils.NiceSort(nodegroups))
+
return {
constants.SS_CLUSTER_NAME: cluster.cluster_name,
constants.SS_CLUSTER_TAGS: cluster_tags,
constants.SS_HYPERVISOR_LIST: hypervisor_list,
constants.SS_MAINTAIN_NODE_HEALTH: str(cluster.maintain_node_health),
constants.SS_UID_POOL: uid_pool,
+ constants.SS_NODEGROUPS: nodegroups_data,
}
@locking.ssynchronized(_config_lock, shared=1)
update_serial = True
elif isinstance(target, objects.Instance):
test = target in self._config_data.instances.values()
+ elif isinstance(target, objects.NodeGroup):
+ test = target in self._config_data.nodegroups.values()
else:
raise errors.ProgrammerError("Invalid object type (%s) passed to"
" ConfigWriter.Update" % type(target))