return True
-def CreateBlockDevice(disk, size, on_primary, info):
+def CreateBlockDevice(disk, size, owner, on_primary, info):
"""Creates a block device for an instance.
Args:
clist = []
if disk.children:
for child in disk.children:
- crdev = _RecursiveAssembleBD(child, on_primary)
+ crdev = _RecursiveAssembleBD(child, owner, on_primary)
if on_primary or disk.AssembleOnSecondary():
# we need the children open in case the device itself has to
# be assembled
device.SetSyncSpeed(constants.SYNC_SPEED)
if on_primary or disk.OpenOnSecondary():
device.Open(force=True)
+ DevCacheManager.UpdateCache(device.dev_path, owner,
+ on_primary, disk.iv_name)
device.SetInfo(info)
logger.Info("Can't attach to device %s in remove" % disk)
rdev = None
if rdev is not None:
+ r_path = rdev.dev_path
result = rdev.Remove()
+ if result:
+ DevCacheManager.RemoveCache(r_path)
else:
result = True
if disk.children:
return result
-def _RecursiveAssembleBD(disk, as_primary):
+def _RecursiveAssembleBD(disk, owner, as_primary):
"""Activate a block device for an instance.
This is run on the primary and secondary nodes for an instance.
children = []
if disk.children:
for chld_disk in disk.children:
- children.append(_RecursiveAssembleBD(chld_disk, as_primary))
+ children.append(_RecursiveAssembleBD(chld_disk, owner, as_primary))
if as_primary or disk.AssembleOnSecondary():
r_dev = bdev.AttachOrAssemble(disk.dev_type, disk.physical_id, children)
r_dev.Open()
else:
r_dev.Close()
+ DevCacheManager.UpdateCache(r_dev.dev_path, owner,
+ as_primary, disk.iv_name)
+
else:
result = True
return result
-def AssembleBlockDevice(disk, as_primary):
+def AssembleBlockDevice(disk, owner, as_primary):
"""Activate a block device for an instance.
This is a wrapper over _RecursiveAssembleBD.
True for secondary nodes
"""
- result = _RecursiveAssembleBD(disk, as_primary)
+ result = _RecursiveAssembleBD(disk, owner, as_primary)
if isinstance(result, bdev.BlockDev):
result = result.dev_path
return result
"""
r_dev = _RecursiveFindBD(disk)
if r_dev is not None:
+ r_path = r_dev.dev_path
result = r_dev.Shutdown()
+ if result:
+ DevCacheManager.RemoveCache(r_path)
else:
result = True
if disk.children:
return False
new_bdevs = [_RecursiveFindBD(disk) for disk in new_cdevs]
if new_bdevs.count(None) > 0:
- logger.Error("Can't find new device(s) to add")
+ logger.Error("Can't find new device(s) to add: %s:%s" %
+ (new_bdevs, new_cdevs))
return False
parent_bdev.AddChildren(new_bdevs)
return True
"""
parent_bdev = _RecursiveFindBD(parent_cdev)
if parent_bdev is None:
+ logger.Error("Can't find parent in remove children: %s" % parent_cdev)
return False
new_bdevs = [_RecursiveFindBD(disk) for disk in new_cdevs]
if new_bdevs.count(None) > 0:
+ logger.Error("Can't find some devices while removing children: %s %s" %
+ (new_cdevs, new_bdevs))
return False
parent_bdev.RemoveChildren(new_bdevs)
return True
detail = str(err)
return detail
+
def _OSSearch(name, search_path=None):
"""Search for OSes with the given name in the search_path.
The base_dir the OS resides in
"""
-
if search_path is None:
search_path = constants.OS_SEARCH_PATH
return None
+
def _OSOndiskVersion(name, os_dir):
"""Compute and return the API version of a given OS.
case when this is not a valid OS name.
"""
-
api_file = os.path.sep.join([os_dir, "ganeti_api_version"])
try:
def DiagnoseOS(top_dirs=None):
"""Compute the validity for all OSes.
- For each name in all the given top directories (if not given defaults i
- to constants.OS_SEARCH_PATH it will return an object. If this is a valid
- os, the object will be an instance of the object.OS class. If not,
- it will be an instance of errors.InvalidOS and this signifies that
- this name does not correspond to a valid OS.
+ Returns an OS object for each name in all the given top directories
+ (if not given defaults to constants.OS_SEARCH_PATH)
Returns:
- list of objects
+ list of OS objects
"""
if top_dirs is None:
os_inst = OSFromDisk(name, base_dir=dir)
result.append(os_inst)
except errors.InvalidOS, err:
- result.append(err)
+ result.append(objects.OS.FromInvalidOS(err))
return result
script)
- return objects.OS(name=name, path=os_dir,
+ return objects.OS(name=name, path=os_dir, status=constants.OS_VALID_STATUS,
create_script=os_scripts['create'],
export_script=os_scripts['export'],
import_script=os_scripts['import'],
result = False
continue
try:
+ old_rpath = dev.dev_path
dev.Rename(unique_id)
+ new_rpath = dev.dev_path
+ if old_rpath != new_rpath:
+ DevCacheManager.RemoveCache(old_rpath)
+ # FIXME: we should add the new cache information here, like:
+ # DevCacheManager.UpdateCache(new_rpath, owner, ...)
+ # but we don't have the owner here - maybe parse from existing
+ # cache? for now, we only lose lvm data when we rename, which
+ # is less critical than DRBD or MD
except errors.BlockDeviceError, err:
logger.Error("Can't rename device '%s' to '%s': %s" %
(dev, unique_id, err))
rr.append(("%s/%s" % (subdir, relname), rrval, output))
return rr
+
+
+class DevCacheManager(object):
+ """Simple class for managing a chache of block device information.
+
+ """
+ _DEV_PREFIX = "/dev/"
+ _ROOT_DIR = constants.BDEV_CACHE_DIR
+
+ @classmethod
+ def _ConvertPath(cls, dev_path):
+ """Converts a /dev/name path to the cache file name.
+
+ This replaces slashes with underscores and strips the /dev
+ prefix. It then returns the full path to the cache file
+
+ """
+ if dev_path.startswith(cls._DEV_PREFIX):
+ dev_path = dev_path[len(cls._DEV_PREFIX):]
+ dev_path = dev_path.replace("/", "_")
+ fpath = "%s/bdev_%s" % (cls._ROOT_DIR, dev_path)
+ return fpath
+
+ @classmethod
+ def UpdateCache(cls, dev_path, owner, on_primary, iv_name):
+ """Updates the cache information for a given device.
+
+ """
+ fpath = cls._ConvertPath(dev_path)
+ if on_primary:
+ state = "primary"
+ else:
+ state = "secondary"
+ if iv_name is None:
+ iv_name = "not_visible"
+ fdata = "%s %s %s\n" % (str(owner), state, iv_name)
+ try:
+ utils.WriteFile(fpath, data=fdata)
+ except EnvironmentError, err:
+ logger.Error("Can't update bdev cache for %s, error %s" %
+ (dev_path, str(err)))
+
+ @classmethod
+ def RemoveCache(cls, dev_path):
+ """Remove data for a dev_path.
+
+ """
+ fpath = cls._ConvertPath(dev_path)
+ try:
+ utils.RemoveFile(fpath)
+ except EnvironmentError, err:
+ logger.Error("Can't update bdev cache for %s, error %s" %
+ (dev_path, str(err)))