from ganeti import constants
from ganeti.storage import bdev
from ganeti.storage import drbd
+from ganeti.storage import filestorage
from ganeti import objects
from ganeti import ssconf
from ganeti import serializer
raise errors.QuitGanetiException(True, "Shutdown scheduled")
-def _GetVgInfo(name, excl_stor):
+def _CheckStorageParams(params, num_params):
+ """Performs sanity checks for storage parameters.
+
+ @type params: list
+ @param params: list of storage parameters
+ @type num_params: int
+ @param num_params: expected number of parameters
+
+ """
+ if params is None:
+ raise errors.ProgrammerError("No storage parameters for storage"
+ " reporting is provided.")
+ if not isinstance(params, list):
+ raise errors.ProgrammerError("The storage parameters are not of type"
+ " list: '%s'" % params)
+ if not len(params) == num_params:
+ raise errors.ProgrammerError("Did not receive the expected number of"
+ "storage parameters: expected %s,"
+ " received '%s'" % (num_params, len(params)))
+
+
+def _CheckLvmStorageParams(params):
+ """Performs sanity check for the 'exclusive storage' flag.
+
+ @see: C{_CheckStorageParams}
+
+ """
+ _CheckStorageParams(params, 1)
+ excl_stor = params[0]
+ if not isinstance(params[0], bool):
+ raise errors.ProgrammerError("Exclusive storage parameter is not"
+ " boolean: '%s'." % excl_stor)
+ return excl_stor
+
+
+def _GetLvmVgSpaceInfo(name, params):
+ """Wrapper around C{_GetVgInfo} which checks the storage parameters.
+
+ @type name: string
+ @param name: name of the volume group
+ @type params: list
+ @param params: list of storage parameters, which in this case should be
+ containing only one for exclusive storage
+
+ """
+ excl_stor = _CheckLvmStorageParams(params)
+ return _GetVgInfo(name, excl_stor)
+
+
+def _GetVgInfo(
+ name, excl_stor, info_fn=bdev.LogicalVolume.GetVGInfo):
"""Retrieves information about a LVM volume group.
"""
# TODO: GetVGInfo supports returning information for multiple VGs at once
- vginfo = bdev.LogicalVolume.GetVGInfo([name], excl_stor)
+ vginfo = info_fn([name], excl_stor)
if vginfo:
vg_free = int(round(vginfo[0][0], 0))
vg_size = int(round(vginfo[0][1], 0))
return {
"type": constants.ST_LVM_VG,
"name": name,
- "vg_free": vg_free,
- "vg_size": vg_size,
+ "storage_free": vg_free,
+ "storage_size": vg_size,
}
-def _GetVgSpindlesInfo(name, excl_stor):
+def _GetLvmPvSpaceInfo(name, params):
+ """Wrapper around C{_GetVgSpindlesInfo} with sanity checks.
+
+ @see: C{_GetLvmVgSpaceInfo}
+
+ """
+ excl_stor = _CheckLvmStorageParams(params)
+ return _GetVgSpindlesInfo(name, excl_stor)
+
+
+def _GetVgSpindlesInfo(
+ name, excl_stor, info_fn=bdev.LogicalVolume.GetVgSpindlesInfo):
"""Retrieves information about spindles in an LVM volume group.
@type name: string
"""
if excl_stor:
- (vg_free, vg_size) = bdev.LogicalVolume.GetVgSpindlesInfo(name)
+ (vg_free, vg_size) = info_fn(name)
else:
vg_free = 0
vg_size = 0
return {
"type": constants.ST_LVM_PV,
"name": name,
- "vg_free": vg_free,
- "vg_size": vg_size,
+ "storage_free": vg_free,
+ "storage_size": vg_size,
}
return map(fn, names)
-def GetNodeInfo(storage_units, hv_specs, excl_stor):
+def GetNodeInfo(storage_units, hv_specs):
"""Gives back a hash with different information about the node.
- @type storage_units: list of pairs (string, string)
- @param storage_units: List of pairs (storage unit, identifier) to ask for disk
- space information. In case of lvm-vg, the identifier is
- the VG name.
+ @type storage_units: list of tuples (string, string, list)
+ @param storage_units: List of tuples (storage unit, identifier, parameters) to
+ ask for disk space information. In case of lvm-vg, the identifier is
+ the VG name. The parameters can contain additional, storage-type-specific
+ parameters, for example exclusive storage for lvm storage.
@type hv_specs: list of pairs (string, dict of strings)
@param hv_specs: list of pairs of a hypervisor's name and its hvparams
- @type excl_stor: boolean
- @param excl_stor: Whether exclusive_storage is active
@rtype: tuple; (string, None/dict, None/dict)
@return: Tuple containing boot ID, volume group information and hypervisor
information
bootid = utils.ReadFile(_BOOT_ID_PATH, size=128).rstrip("\n")
storage_info = _GetNamedNodeInfo(
storage_units,
- (lambda storage_unit: _ApplyStorageInfoFunction(storage_unit[0],
- storage_unit[1],
- excl_stor)))
+ (lambda (storage_type, storage_key, storage_params):
+ _ApplyStorageInfoFunction(storage_type, storage_key, storage_params)))
hv_info = _GetHvInfoAll(hv_specs)
return (bootid, storage_info, hv_info)
+def _GetFileStorageSpaceInfo(path, params):
+ """Wrapper around filestorage.GetSpaceInfo.
+
+ The purpose of this wrapper is to call filestorage.GetFileStorageSpaceInfo
+ and ignore the *args parameter to not leak it into the filestorage
+ module's code.
+
+ @see: C{filestorage.GetFileStorageSpaceInfo} for description of the
+ parameters.
+
+ """
+ _CheckStorageParams(params, 0)
+ return filestorage.GetFileStorageSpaceInfo(path)
+
+
# FIXME: implement storage reporting for all missing storage types.
_STORAGE_TYPE_INFO_FN = {
constants.ST_BLOCK: None,
constants.ST_DISKLESS: None,
constants.ST_EXT: None,
- constants.ST_FILE: None,
- constants.ST_LVM_PV: _GetVgSpindlesInfo,
- constants.ST_LVM_VG: _GetVgInfo,
+ constants.ST_FILE: _GetFileStorageSpaceInfo,
+ constants.ST_LVM_PV: _GetLvmPvSpaceInfo,
+ constants.ST_LVM_VG: _GetLvmVgSpaceInfo,
constants.ST_RADOS: None,
}
real_disk = _OpenRealBD(disk)
result["DISK_%d_PATH" % idx] = real_disk.dev_path
result["DISK_%d_ACCESS" % idx] = disk.mode
+ result["DISK_%d_UUID" % idx] = disk.uuid
+ if disk.name:
+ result["DISK_%d_NAME" % idx] = disk.name
if constants.HV_DISK_TYPE in instance.hvparams:
result["DISK_%d_FRONTEND_TYPE" % idx] = \
instance.hvparams[constants.HV_DISK_TYPE]
# NICs
for idx, nic in enumerate(instance.nics):
result["NIC_%d_MAC" % idx] = nic.mac
+ result["NIC_%d_UUID" % idx] = nic.uuid
+ if nic.name:
+ result["NIC_%d_NAME" % idx] = nic.name
if nic.ip:
result["NIC_%d_IP" % idx] = nic.ip
result["NIC_%d_MODE" % idx] = nic.nicparams[constants.NIC_MODE]
return result
-def BlockdevGrow(disk, amount, dryrun, backingstore):
+def BlockdevGrow(disk, amount, dryrun, backingstore, excl_stor):
"""Grow a stack of block devices.
This function is called recursively, with the childrens being the
only, or on "logical" storage only; e.g. DRBD is logical storage,
whereas LVM, file, RBD are backing storage
@rtype: (status, result)
+ @type excl_stor: boolean
+ @param excl_stor: Whether exclusive_storage is active
@return: a tuple with the status of the operation (True/False), and
the errors message if status is False
_Fail("Cannot find block device %s", disk)
try:
- r_dev.Grow(amount, dryrun, backingstore)
+ r_dev.Grow(amount, dryrun, backingstore, excl_stor)
except errors.BlockDeviceError, err:
_Fail("Failed to grow block device: %s", err, exc=True)
shutil.rmtree(status_dir, ignore_errors=True)
-def _FindDisks(target_node_uuid, nodes_ip, disks):
- """Sets the physical ID on disks and returns the block devices.
+def _SetPhysicalId(target_node_uuid, nodes_ip, disks):
+ """Sets the correct physical ID on all passed disks.
"""
- # set the correct physical ID
for cf in disks:
cf.SetPhysicalID(target_node_uuid, nodes_ip)
+
+def _FindDisks(target_node_uuid, nodes_ip, disks):
+ """Sets the physical ID on disks and returns the block devices.
+
+ """
+ _SetPhysicalId(target_node_uuid, nodes_ip, disks)
+
bdevs = []
for cf in disks:
return (alldone, min_resync)
+def DrbdNeedsActivation(target_node_uuid, nodes_ip, disks):
+ """Checks which of the passed disks needs activation and returns their UUIDs.
+
+ """
+ _SetPhysicalId(target_node_uuid, nodes_ip, disks)
+ faulty_disks = []
+
+ for disk in disks:
+ rd = _RecursiveFindBD(disk)
+ if rd is None:
+ faulty_disks.append(disk)
+ continue
+
+ stats = rd.GetProcStatus()
+ if stats.is_standalone or stats.is_diskless:
+ faulty_disks.append(disk)
+
+ return [disk.uuid for disk in faulty_disks]
+
+
def GetDrbdUsermodeHelper():
"""Returns DRBD usermode helper currently configured.
projects / ganeti-local / blobdiff