return new_resource
+def _MatchNameComponentIgnoreCase(short_name, names):
+ """Wrapper around L{utils.text.MatchNameComponent}.
+
+ """
+ return utils.MatchNameComponent(short_name, names, case_sensitive=False)
+
+
class ConfigWriter:
"""The interface to the cluster configuration.
return self._config_data.cluster.file_storage_dir
@locking.ssynchronized(_config_lock, shared=1)
+ def GetSharedFileStorageDir(self):
+ """Get the shared file storage dir for this cluster.
+
+ """
+ return self._config_data.cluster.shared_file_storage_dir
+
+ @locking.ssynchronized(_config_lock, shared=1)
def GetHypervisorType(self):
"""Get the hypervisor type for this cluster.
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.cluster.serial_no += 1
self._WriteConfig()
- @locking.ssynchronized(_config_lock, shared=1)
- def LookupNodeGroup(self, target):
+ def _UnlockedLookupNodeGroup(self, target):
"""Lookup a node group's UUID.
@type target: string or None
raise errors.OpPrereqError("Node group '%s' not found" % target,
errors.ECODE_NOENT)
+ @locking.ssynchronized(_config_lock, shared=1)
+ 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.
"""
return self._UnlockedGetInstanceList()
- @locking.ssynchronized(_config_lock, shared=1)
def ExpandInstanceName(self, short_name):
"""Attempt to expand an incomplete instance name.
"""
- return utils.MatchNameComponent(short_name,
- self._config_data.instances.keys(),
- case_sensitive=False)
+ # Locking is done in L{ConfigWriter.GetInstanceList}
+ return _MatchNameComponentIgnoreCase(short_name, self.GetInstanceList())
def _UnlockedGetInstanceInfo(self, instance_name):
"""Returns information about an instance.
return self._UnlockedGetInstanceInfo(instance_name)
@locking.ssynchronized(_config_lock, shared=1)
+ def GetInstanceNodeGroups(self, instance_name, primary_only=False):
+ """Returns set of node group UUIDs for instance's nodes.
+
+ @rtype: frozenset
+
+ """
+ instance = self._UnlockedGetInstanceInfo(instance_name)
+ if not instance:
+ raise errors.ConfigurationError("Unknown instance '%s'" % instance_name)
+
+ if primary_only:
+ nodes = [instance.primary_node]
+ else:
+ nodes = instance.all_nodes
+
+ return frozenset(self._UnlockedGetNodeInfo(node_name).group
+ for node_name in nodes)
+
+ @locking.ssynchronized(_config_lock, shared=1)
def GetAllInstancesInfo(self):
"""Get the configuration of all instances.
self._config_data.cluster.serial_no += 1
self._WriteConfig()
- @locking.ssynchronized(_config_lock, shared=1)
def ExpandNodeName(self, short_name):
- """Attempt to expand an incomplete instance name.
+ """Attempt to expand an incomplete node name.
"""
- return utils.MatchNameComponent(short_name,
- self._config_data.nodes.keys(),
- case_sensitive=False)
+ # Locking is done in L{ConfigWriter.GetNodeList}
+ return _MatchNameComponentIgnoreCase(short_name, self.GetNodeList())
def _UnlockedGetNodeInfo(self, node_name):
"""Get the configuration of a node, as stored in the config.
self._config_data.nodegroups.values()]
nodegroups_data = fn(utils.NiceSort(nodegroups))
- return {
+ ssconf_values = {
constants.SS_CLUSTER_NAME: cluster.cluster_name,
constants.SS_CLUSTER_TAGS: cluster_tags,
constants.SS_FILE_STORAGE_DIR: cluster.file_storage_dir,
+ constants.SS_SHARED_FILE_STORAGE_DIR: cluster.shared_file_storage_dir,
constants.SS_MASTER_CANDIDATES: mc_data,
constants.SS_MASTER_CANDIDATES_IPS: mc_ips_data,
constants.SS_MASTER_IP: cluster.master_ip,
constants.SS_UID_POOL: uid_pool,
constants.SS_NODEGROUPS: nodegroups_data,
}
+ bad_values = [(k, v) for k, v in ssconf_values.items()
+ if not isinstance(v, (str, basestring))]
+ if bad_values:
+ err = utils.CommaJoin("%s=%s" % (k, v) for k, v in bad_values)
+ raise errors.ConfigurationError("Some ssconf key(s) have non-string"
+ " values: %s" % err)
+ return ssconf_values
@locking.ssynchronized(_config_lock, shared=1)
def GetSsconfValues(self):