if os.path.isfile(full_name) and not os.path.islink(full_name):
utils.RemoveFile(full_name)
-
try:
priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.GANETI_RUNAS)
except errors.OpExecError, err:
result.output)
return {}
- lvlist = [line.split() for line in result.output.splitlines()]
+ lvlist = [line.split() for line in result.stdout.splitlines()]
return dict(lvlist)
'vg': line[3].strip(),
}
- return [map_line(line.split('|')) for line in result.output.splitlines()]
+ return [map_line(line.split('|')) for line in result.stdout.splitlines()]
def BridgesExist(bridges_list):
raise ValueError("Can't create child device for %s, %s" %
(disk, size))
if on_primary or disk.AssembleOnSecondary():
- device.Assemble()
+ if not device.Assemble():
+ errorstring = "Can't assemble device after creation"
+ logger.Error(errorstring)
+ raise errors.BlockDeviceError("%s, very unusual event - check the node"
+ " daemon logs" % errorstring)
device.SetSyncSpeed(constants.SYNC_SPEED)
if on_primary or disk.OpenOnSecondary():
device.Open(force=True)
"""
children = []
if disk.children:
+ mcn = disk.ChildrenNeeded()
+ if mcn == -1:
+ mcn = 0 # max number of Nones allowed
+ else:
+ mcn = len(disk.children) - mcn # max number of Nones
for chld_disk in disk.children:
- children.append(_RecursiveAssembleBD(chld_disk, owner, as_primary))
+ try:
+ cdev = _RecursiveAssembleBD(chld_disk, owner, as_primary)
+ except errors.BlockDeviceError, err:
+ if children.count(None) >= mcn:
+ raise
+ cdev = None
+ logger.Debug("Error in child activation: %s" % str(err))
+ children.append(cdev)
if as_primary or disk.AssembleOnSecondary():
r_dev = bdev.AttachOrAssemble(disk.dev_type, disk.physical_id, children)
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)
+ devs = []
+ for disk in new_cdevs:
+ rpath = disk.StaticDevPath()
+ if rpath is None:
+ bd = _RecursiveFindBD(disk)
+ if bd is None:
+ logger.Error("Can't find dynamic device %s while removing children" %
+ disk)
+ return False
+ else:
+ devs.append(bd.dev_path)
+ else:
+ devs.append(rpath)
+ parent_bdev.RemoveChildren(devs)
return True
rbd = _RecursiveFindBD(disk)
if rbd is None:
return rbd
- sync_p, est_t, is_degr = rbd.GetSyncStatus()
- return rbd.dev_path, rbd.major, rbd.minor, sync_p, est_t, is_degr
+ return (rbd.dev_path, rbd.major, rbd.minor) + rbd.GetSyncStatus()
def UploadFile(file_name, data, mode, uid, gid, atime, mtime):
if search_path is None:
search_path = constants.OS_SEARCH_PATH
- for dir in search_path:
- t_os_dir = os.path.sep.join([dir, name])
+ for dir_name in search_path:
+ t_os_dir = os.path.sep.join([dir_name, name])
if os.path.isdir(t_os_dir):
- return dir
+ return dir_name
return None
def DiagnoseOS(top_dirs=None):
"""Compute the validity for all OSes.
- For each name in all the given top directories (if not given defaults
- 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:
top_dirs = constants.OS_SEARCH_PATH
result = []
- for dir in top_dirs:
- if os.path.isdir(dir):
+ for dir_name in top_dirs:
+ if os.path.isdir(dir_name):
try:
- f_names = utils.ListVisibleFiles(dir)
+ f_names = utils.ListVisibleFiles(dir_name)
except EnvironmentError, err:
- logger.Error("Can't list the OS directory %s: %s" % (dir,str(err)))
+ logger.Error("Can't list the OS directory %s: %s" %
+ (dir_name, str(err)))
break
for name in f_names:
try:
- os_inst = OSFromDisk(name, base_dir=dir)
+ os_inst = OSFromDisk(name, base_dir=dir_name)
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'],
return None
else:
raise errors.ProgrammerError("Cannot snapshot non-lvm block device"
- "'%s' of type '%s'" %
+ " '%s' of type '%s'" %
(disk.unique_id, disk.dev_type))
"""Updates the cache information for a given device.
"""
+ if dev_path is None:
+ logger.Error("DevCacheManager.UpdateCache got a None dev_path")
+ return
fpath = cls._ConvertPath(dev_path)
if on_primary:
state = "primary"
"""Remove data for a dev_path.
"""
+ if dev_path is None:
+ logger.Error("DevCacheManager.RemoveCache got a None dev_path")
+ return
fpath = cls._ConvertPath(dev_path)
try:
utils.RemoveFile(fpath)
projects / ganeti-local / blobdiff