#
#
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 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
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.
configuration errors
"""
+ # pylint: disable-msg=R0914
result = []
seen_macs = []
ports = {}
data = self._config_data
+ cluster = data.cluster
seen_lids = []
seen_pids = []
# global cluster checks
- if not data.cluster.enabled_hypervisors:
+ if not cluster.enabled_hypervisors:
result.append("enabled hypervisors list doesn't have any entries")
- invalid_hvs = set(data.cluster.enabled_hypervisors) - constants.HYPER_TYPES
+ invalid_hvs = set(cluster.enabled_hypervisors) - constants.HYPER_TYPES
if invalid_hvs:
result.append("enabled hypervisors contains invalid entries: %s" %
invalid_hvs)
- missing_hvp = (set(data.cluster.enabled_hypervisors) -
- set(data.cluster.hvparams.keys()))
+ missing_hvp = (set(cluster.enabled_hypervisors) -
+ set(cluster.hvparams.keys()))
if missing_hvp:
result.append("hypervisor parameters missing for the enabled"
" hypervisor(s) %s" % utils.CommaJoin(missing_hvp))
- if data.cluster.master_node not in data.nodes:
+ if cluster.master_node not in data.nodes:
result.append("cluster has invalid primary node '%s'" %
- data.cluster.master_node)
+ cluster.master_node)
+
+ def _helper(owner, attr, value, template):
+ try:
+ utils.ForceDictType(value, template)
+ except errors.GenericError, err:
+ result.append("%s has invalid %s: %s" % (owner, attr, err))
+
+ def _helper_nic(owner, params):
+ try:
+ objects.NIC.CheckParameterSyntax(params)
+ except errors.ConfigurationError, err:
+ result.append("%s has invalid nicparams: %s" % (owner, err))
+
+ # check cluster parameters
+ _helper("cluster", "beparams", cluster.SimpleFillBE({}),
+ constants.BES_PARAMETER_TYPES)
+ _helper("cluster", "nicparams", cluster.SimpleFillNIC({}),
+ constants.NICS_PARAMETER_TYPES)
+ _helper_nic("cluster", cluster.SimpleFillNIC({}))
+ _helper("cluster", "ndparams", cluster.SimpleFillND({}),
+ constants.NDS_PARAMETER_TYPES)
# per-instance checks
for instance_name in data.instances:
(instance_name, idx, nic.mac))
else:
seen_macs.append(nic.mac)
+ if nic.nicparams:
+ filled = cluster.SimpleFillNIC(nic.nicparams)
+ owner = "instance %s nic %d" % (instance.name, idx)
+ _helper(owner, "nicparams",
+ filled, constants.NICS_PARAMETER_TYPES)
+ _helper_nic(owner, filled)
+
+ # parameter checks
+ if instance.beparams:
+ _helper("instance %s" % instance.name, "beparams",
+ cluster.FillBE(instance), constants.BES_PARAMETER_TYPES)
# gather the drbd ports for duplicate checks
for dsk in instance.disks:
result.extend(self._CheckDiskIDs(disk, seen_lids, seen_pids))
# cluster-wide pool of free ports
- for free_port in data.cluster.tcpudp_port_pool:
+ for free_port in cluster.tcpudp_port_pool:
if free_port not in ports:
ports[free_port] = []
ports[free_port].append(("cluster", "port marked as free"))
# highest used tcp port check
if keys:
- if keys[-1] > data.cluster.highest_used_port:
+ if keys[-1] > cluster.highest_used_port:
result.append("Highest used port mismatch, saved %s, computed %s" %
- (data.cluster.highest_used_port, keys[-1]))
+ (cluster.highest_used_port, keys[-1]))
- if not data.nodes[data.cluster.master_node].master_candidate:
+ if not data.nodes[cluster.master_node].master_candidate:
result.append("Master node is not a master candidate")
# master candidate checks
" drain=%s, offline=%s" %
(node.name, node.master_candidate, node.drained,
node.offline))
+ if node.group not in data.nodegroups:
+ result.append("Node '%s' has invalid group '%s'" %
+ (node.name, node.group))
+ else:
+ _helper("node %s" % node.name, "ndparams",
+ cluster.FillND(node, data.nodegroups[node.group]),
+ constants.NDS_PARAMETER_TYPES)
# 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("nodegroup '%s' (uuid: '%s') has uuid-like name" %
+ result.append("node group '%s' (uuid: '%s') has uuid-like name" %
(nodegroup.name, nodegroup.uuid))
if nodegroup.name in nodegroups_names:
- result.append("duplicate nodegroup name '%s'" % nodegroup.name)
+ result.append("duplicate node group name '%s'" % nodegroup.name)
else:
nodegroups_names.add(nodegroup.name)
+ if nodegroup.ndparams:
+ _helper("group %s" % nodegroup.name, "ndparams",
+ cluster.SimpleFillND(nodegroup.ndparams),
+ constants.NDS_PARAMETER_TYPES)
+
# drbd minors check
_, duplicates = self._UnlockedComputeDRBDMap()
" %s and %s" % (minor, node, instance_a, instance_b))
# IP checks
- default_nicparams = data.cluster.nicparams[constants.PP_DEFAULT]
+ default_nicparams = cluster.nicparams[constants.PP_DEFAULT]
ips = {}
def _AddIpAddress(ip, name):
ips.setdefault(ip, []).append(name)
- _AddIpAddress(data.cluster.master_ip, "cluster_ip")
+ _AddIpAddress(cluster.master_ip, "cluster_ip")
for node in data.nodes.values():
_AddIpAddress(node.primary_ip, "node:%s/primary" % node.name)
"""
return self._config_data.cluster.primary_ip_family
- @locking.ssynchronized(_config_lock, shared=1)
- def LookupNodeGroup(self, target):
+ @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)
+
+ try:
+ existing_uuid = self._UnlockedLookupNodeGroup(group.name)
+ except errors.OpPrereqError:
+ pass
+ else:
+ raise errors.OpPrereqError("Desired group name '%s' already exists as a"
+ " node group (UUID: %s)" %
+ (group.name, existing_uuid),
+ errors.ECODE_EXISTS)
+
+ 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)
+
+ assert len(self._config_data.nodegroups) != 1, \
+ "Group '%s' is the only group, cannot be removed" % group_uuid
+
+ del self._config_data.nodegroups[group_uuid]
+ self._config_data.cluster.serial_no += 1
+ self._WriteConfig()
+
+ def _UnlockedLookupNodeGroup(self, target):
"""Lookup a node group's UUID.
@type target: string or None
"""
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)
@locking.ssynchronized(_config_lock, shared=1)
- def GetNodeGroup(self, uuid):
+ def LookupNodeGroup(self, target):
+ """Lookup a node group's UUID.
+
+ This function is just a wrapper over L{_UnlockedLookupNodeGroup}.
+
+ @type target: string or None
+ @param target: group name or UUID or None to look for the default
+ @rtype: string
+ @return: nodegroup UUID
+
+ """
+ return self._UnlockedLookupNodeGroup(target)
+
+ def _UnlockedGetNodeGroup(self, uuid):
"""Lookup a node group.
@type uuid: string
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.
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
return self._UnlockedGetOnlineNodeList()
@locking.ssynchronized(_config_lock, shared=1)
+ def GetVmCapableNodeList(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 node.vm_capable]
+
+ @locking.ssynchronized(_config_lock, shared=1)
def GetNonVmCapableNodeList(self):
"""Return the list of nodes which are not vm capable.
for node in self._UnlockedGetNodeList()])
return my_dict
+ @locking.ssynchronized(_config_lock, shared=1)
+ def GetNodeGroupsFromNodes(self, nodes):
+ """Returns groups for a list of nodes.
+
+ @type nodes: list of string
+ @param nodes: List of node names
+ @rtype: frozenset
+
+ """
+ return frozenset(self._UnlockedGetNodeInfo(name).group for name in nodes)
+
def _UnlockedGetMasterCandidateStats(self, exceptions=None):
"""Get the number of current and maximum desired and possible candidates.
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:
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))
projects / ganeti-local / blobdiff