lvm fallback done
This commit is contained in:
brent s
parent
b633b22f59
commit
083c966cad
|
|
@ -88,7 +88,6 @@ class PV(object):
|
|||
except _BlockDev.LVMError:
|
||||
self.meta = None
|
||||
self.is_pooled = False
|
||||
u = uuid.uuid4()
|
||||
opts = [_BlockDev.ExtraArg.new('--reportformat', 'json')]
|
||||
# FUCK. LVM. You can't *specify* a UUID.
|
||||
# u = uuid.uuid4()
|
||||
|
|
@ -114,13 +113,15 @@ class VG(object):
|
|||
self.pe_size = aif.utils.size.convertStorage(self.pe_size,
|
||||
x['type'],
|
||||
target = 'B')
|
||||
if not aif.utils.isPowerofTwo(self.pe_size):
|
||||
raise ValueError('The PE size must be a power of two (in bytes)')
|
||||
self.lvs = []
|
||||
self.pvs = []
|
||||
# self.tags = []
|
||||
# for te in self.xml.findall('tags/tag'):
|
||||
# self.tags.append(te.text)
|
||||
_common.addBDPlugin('lvm')
|
||||
self.devpath = self.name
|
||||
self.devpath = '/dev/{0}'.format(self.name)
|
||||
self.info = None
|
||||
self.created = False
|
||||
|
||||
|
|
@ -144,8 +145,8 @@ class VG(object):
|
|||
[p.devpath for p in self.pvs],
|
||||
self.pe_size,
|
||||
opts)
|
||||
for p in self.pvs:
|
||||
p._parseMeta()
|
||||
for pv in self.pvs:
|
||||
pv._parseMeta()
|
||||
self.created = True
|
||||
self.updateInfo()
|
||||
return()
|
||||
|
|
@ -200,6 +201,7 @@ class LV(object):
|
|||
self.id = self.xml.attrib('id')
|
||||
self.name = self.xml.attrib('name')
|
||||
self.vg = vgobj
|
||||
self.qualified_name = '{0}/{1}'.format(self.vg.name, self.name)
|
||||
self.pvs = []
|
||||
if not isinstance(self.vg, VG):
|
||||
raise ValueError('vgobj must be of type aif.disk.lvm.VG')
|
||||
|
|
@ -220,7 +222,6 @@ class LV(object):
|
|||
if not self.pvs: # We get all in the VG instead since none were explicitly assigned
|
||||
self.pvs = self.vg.pvs
|
||||
# Size processing. We have to do this after indexing PVs.
|
||||
# TODO: allow specify PE size (t_lvsize? as well?)?
|
||||
# If not x['type'], assume *extents*, not sectors
|
||||
self.size = self.xml.attrib('size') # Convert to bytes. Can get max from _BlockDev.lvm.vginfo(<VG>).free TODO
|
||||
x = dict(zip(('from_bgn', 'size', 'type'),
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
import datetime
|
||||
import json
|
||||
import subprocess
|
||||
##
|
||||
import aif.utils
|
||||
import aif.disk.block_fallback as block
|
||||
import aif.disk.luks_fallback as luks
|
||||
import aif.disk.mdadm_fallback as mdadm
|
||||
|
|
@ -26,37 +29,305 @@ class PV(object):
|
|||
self._parseMeta()
|
||||
|
||||
def _parseMeta(self):
|
||||
pass # TODO
|
||||
# Note, the "UUID" for LVM is *not* a true UUID (RFC4122) so we don't convert it.
|
||||
# https://unix.stackexchange.com/questions/173722/what-is-the-uuid-format-used-by-lvm
|
||||
meta = {}
|
||||
cmd = ['pvs',
|
||||
'--binary',
|
||||
'--nosuffix',
|
||||
'--units', 'b',
|
||||
'--options', '+pvall',
|
||||
'--reportformat', 'json',
|
||||
self.devpath]
|
||||
_meta = subprocess.run(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
|
||||
if _meta.returncode != 0:
|
||||
self.meta = None
|
||||
self.is_pooled = False
|
||||
return()
|
||||
_meta = json.loads(_meta.stdout.decode('utf-8'))['report'][0]['pv'][0]
|
||||
for k, v in _meta.items():
|
||||
# We *could* regex this but the pattern would be a little more complex than idea,
|
||||
# especially for such predictable strings.
|
||||
# These are ints.
|
||||
if k in ('dev_size', 'pe_start', 'pv_ba_size', 'pv_ba_start', 'pv_ext_vsn', 'pv_free', 'pv_major',
|
||||
'pv_mda_count', 'pv_mda_free', 'pv_mda_size', 'pv_mda_used_count', 'pv_minor', 'pv_pe_alloc_count',
|
||||
'pv_pe_alloc_count', 'pv_size', 'pv_used'):
|
||||
v = int(v)
|
||||
# These are boolean.
|
||||
elif k in ('pv_allocatable', 'pv_duplicate', 'pv_exported', 'pv_in_use', 'pv_missing'):
|
||||
v = (True if int(v) == 1 else False)
|
||||
# This is a list.
|
||||
elif k == 'pv_tags':
|
||||
v = [i.strip() for i in v.split(',') if i.strip() != '']
|
||||
elif v.strip() == '':
|
||||
v = None
|
||||
meta[k] = v
|
||||
self.meta = meta
|
||||
self.is_pooled = True
|
||||
return()
|
||||
|
||||
|
||||
class LV(object):
|
||||
def __init__(self, lv_xml, pv_objs, vg_obj):
|
||||
self.xml = lv_xml
|
||||
self.id = self.xml.attrib('id')
|
||||
self.name = self.xml.attrib('name')
|
||||
self.size = self.xml.attrib('size') # Convert to bytes. Can get max from _BlockDev.lvm.vginfo(<VG>).free
|
||||
self.pvs = pv_objs
|
||||
self.vg = vg_obj
|
||||
for p in self.pvs:
|
||||
if not isinstance(p, PV):
|
||||
raise ValueError('pv_objs must be a list-like containing aif.disk.lvm.PV items')
|
||||
if not isinstance(self.vg, VG):
|
||||
raise ValueError('vg_obj must be of type aif.disk.lvm.VG')
|
||||
# TODO
|
||||
self.devpath = None
|
||||
pass
|
||||
def prepare(self):
|
||||
if not self.meta:
|
||||
self._parseMeta()
|
||||
# *Technically*, we should vgreduce before pvremove, but eff it.
|
||||
cmd = ['pvremove',
|
||||
'--force', '--force',
|
||||
'--reportformat', 'json',
|
||||
self.devpath]
|
||||
subprocess.run(cmd)
|
||||
cmd = ['pvcreate',
|
||||
'--reportformat', 'json',
|
||||
self.devpath]
|
||||
subprocess.run(cmd)
|
||||
self._parseMeta()
|
||||
return()
|
||||
|
||||
|
||||
class VG(object):
|
||||
def __init__(self, vg_xml, lv_objs):
|
||||
def __init__(self, vg_xml):
|
||||
self.xml = vg_xml
|
||||
self.id = self.xml.attrib('id')
|
||||
self.name = self.xml.attrib('name')
|
||||
self.lvs = lv_objs
|
||||
for l in self.lvs:
|
||||
if not isinstance(l, LV):
|
||||
raise ValueError('lv_objs must be a list-like containing aif.disk.lvm.LV items')
|
||||
# TODO
|
||||
self.pe_size = self.xml.attrib.get('extentSize', 0)
|
||||
if self.pe_size:
|
||||
x = dict(zip(('from_bgn', 'size', 'type'),
|
||||
aif.utils.convertSizeUnit(self.pe_size)))
|
||||
if x['type']:
|
||||
self.pe_size = aif.utils.size.convertStorage(self.pe_size,
|
||||
x['type'],
|
||||
target = 'B')
|
||||
if not aif.utils.isPowerofTwo(self.pe_size):
|
||||
raise ValueError('The PE size must be a power of two (in bytes)')
|
||||
self.lvs = []
|
||||
self.pvs = []
|
||||
# self.tags = []
|
||||
# for te in self.xml.findall('tags/tag'):
|
||||
# self.tags.append(te.text)
|
||||
self.devpath = None
|
||||
pass
|
||||
self.devpath = self.name
|
||||
self.info = None
|
||||
self.created = False
|
||||
|
||||
def addPV(self, pvobj):
|
||||
if not isinstance(pvobj, PV):
|
||||
raise ValueError('pvobj must be of type aif.disk.lvm.PV')
|
||||
pvobj.prepare()
|
||||
self.pvs.append(pvobj)
|
||||
return()
|
||||
|
||||
def create(self):
|
||||
if not self.pvs:
|
||||
raise RuntimeError('Cannot create a VG with no PVs')
|
||||
cmd = ['vgcreate',
|
||||
'--reportformat', 'json',
|
||||
'--physicalextentsize', '{0}b'.format(self.pe_size),
|
||||
self.name]
|
||||
for pv in self.pvs:
|
||||
cmd.append(pv.devpath)
|
||||
subprocess.run(cmd)
|
||||
for pv in self.pvs:
|
||||
pv._parseMeta()
|
||||
self.created = True
|
||||
self.updateInfo()
|
||||
return()
|
||||
|
||||
def createLV(self, lv_xml = None):
|
||||
if not self.created:
|
||||
raise RuntimeError('VG must be created before LVs can be added')
|
||||
# If lv_xml is None, we loop through our own XML.
|
||||
if lv_xml:
|
||||
lv = LV(lv_xml, self)
|
||||
lv.create()
|
||||
# self.lvs.append(lv)
|
||||
else:
|
||||
for le in self.xml.findall('logicalVolumes/lv'):
|
||||
lv = LV(le, self)
|
||||
lv.create()
|
||||
# self.lvs.append(lv)
|
||||
self.updateInfo()
|
||||
return()
|
||||
|
||||
def start(self):
|
||||
cmd = ['vgchange',
|
||||
'--activate', 'y',
|
||||
'--reportformat', 'json',
|
||||
self.name]
|
||||
subprocess.run(cmd)
|
||||
self.updateInfo()
|
||||
return()
|
||||
|
||||
def stop(self):
|
||||
cmd = ['vgchange',
|
||||
'--activate', 'n',
|
||||
'--reportformat', 'json',
|
||||
self.name]
|
||||
subprocess.run(cmd)
|
||||
self.updateInfo()
|
||||
return()
|
||||
|
||||
def updateInfo(self):
|
||||
info = {}
|
||||
cmd = ['vgs',
|
||||
'--binary',
|
||||
'--nosuffix',
|
||||
'--units', 'b',
|
||||
'--options', '+vgall',
|
||||
'--reportformat', 'json',
|
||||
self.name]
|
||||
_info = subprocess.run(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
|
||||
if _info.returncode != 0:
|
||||
self.info = None
|
||||
self.created = False
|
||||
return()
|
||||
_info = json.loads(_info.stdout.decode('utf-8'))['report'][0]['vg'][0]
|
||||
for k, v in _info.items():
|
||||
# ints
|
||||
if k in ('lv_count', 'max_lv', 'max_pv', 'pv_count', 'snap_count', 'vg_extent_count', 'vg_extent_size',
|
||||
'vg_free', 'vg_free_count', 'vg_mda_count', 'vg_mda_free', 'vg_mda_size', 'vg_mda_used_count',
|
||||
'vg_missing_pv_count', 'vg_seqno', 'vg_size'):
|
||||
v = int(v)
|
||||
# booleans
|
||||
elif k in ('vg_clustered', 'vg_exported', 'vg_extendable', 'vg_partial', 'vg_shared'):
|
||||
v = (True if int(v) == 1 else False)
|
||||
# lists
|
||||
elif k in ('vg_lock_args', 'vg_permissions', 'vg_tags'): # not 100% sure about vg_permissions...
|
||||
v = [i.strip() for i in v.split(',') if i.strip() != '']
|
||||
elif v.strip() == '':
|
||||
v = None
|
||||
info[k] = v
|
||||
self.info = info
|
||||
return()
|
||||
|
||||
|
||||
class LV(object):
|
||||
def __init__(self, lv_xml, vgobj):
|
||||
self.xml = lv_xml
|
||||
self.id = self.xml.attrib('id')
|
||||
self.name = self.xml.attrib('name')
|
||||
self.vg = vgobj
|
||||
self.qualified_name = '{0}/{1}'.format(self.vg.name, self.name)
|
||||
self.pvs = []
|
||||
if not isinstance(self.vg, VG):
|
||||
raise ValueError('vgobj must be of type aif.disk.lvm.VG')
|
||||
self.info = None
|
||||
self.devpath = '/dev/{0}/{1}'.format(self.vg.name, self.name)
|
||||
self.created = False
|
||||
self.updateInfo()
|
||||
self._initLV()
|
||||
|
||||
def _initLV(self):
|
||||
self.pvs = []
|
||||
_indexed_pvs = {i.id: i for i in self.vg.pvs}
|
||||
for pe in self.xml.findall('pvMember'):
|
||||
pv_id = pe.attrib('source')
|
||||
if pv_id in _indexed_pvs.keys():
|
||||
self.pvs.append(_indexed_pvs[pv_id])
|
||||
if not self.pvs: # We get all in the VG instead since none were explicitly assigned
|
||||
self.pvs = self.vg.pvs
|
||||
# Size processing. We have to do this after indexing PVs.
|
||||
# If not x['type'], assume *extents*, not sectors
|
||||
self.size = self.xml.attrib('size') # Convert to bytes. Can get max from _BlockDev.lvm.vginfo(<VG>).free TODO
|
||||
x = dict(zip(('from_bgn', 'size', 'type'),
|
||||
aif.utils.convertSizeUnit(self.xml.attrib['size'])))
|
||||
# self.size is bytes
|
||||
self.size = x['size']
|
||||
_extents = {'size': self.vg.info['extent_size'],
|
||||
'total': 0} # We can't use self.vg.info['extent_count'] because selective PVs.
|
||||
_sizes = {'total': 0,
|
||||
'free': 0}
|
||||
_vg_pe = self.vg.info['extent_size']
|
||||
for pv in self.pvs:
|
||||
_sizes['total'] += pv.info['pv_size']
|
||||
_sizes['free'] += pv.info['pv_free']
|
||||
_extents['total'] += int(pv.info['pv_size'] / _extents['size'])
|
||||
if x['type'] == '%':
|
||||
self.size = int(_sizes['total'] * (0.01 * self.size))
|
||||
elif x['type'] is None:
|
||||
self.size = int(self.size * _extents['size'])
|
||||
else:
|
||||
self.size = int(aif.utils.size.convertStorage(x['size'],
|
||||
x['type'],
|
||||
target = 'B'))
|
||||
if self.size >= _sizes['total']:
|
||||
self.size = 0
|
||||
return()
|
||||
|
||||
def create(self):
|
||||
if not self.pvs:
|
||||
raise RuntimeError('Cannot create LV with no associated LVs')
|
||||
cmd = ['lvcreate',
|
||||
'--reportformat', 'json']
|
||||
if self.size > 0:
|
||||
cmd.extend(['--size', self.size])
|
||||
elif self.size == 0:
|
||||
cmd.extend(['--extents', '100%FREE'])
|
||||
cmd.extend([self.name,
|
||||
self.vg.name])
|
||||
self.vg.lvs.append(self)
|
||||
self.created = True
|
||||
self.updateInfo()
|
||||
self.vg.updateInfo()
|
||||
return()
|
||||
|
||||
def start(self):
|
||||
cmd = ['lvchange',
|
||||
'--activate', 'y',
|
||||
'--reportformat', 'json',
|
||||
self.qualified_name]
|
||||
subprocess.run(cmd)
|
||||
self.updateInfo()
|
||||
return()
|
||||
|
||||
def stop(self):
|
||||
cmd = ['lvchange',
|
||||
'--activate', 'n',
|
||||
'--reportformat', 'json',
|
||||
self.qualified_name]
|
||||
subprocess.run(cmd)
|
||||
self.updateInfo()
|
||||
return()
|
||||
|
||||
def updateInfo(self):
|
||||
info = {}
|
||||
cmd = ['lvs',
|
||||
'--binary',
|
||||
'--nosuffix',
|
||||
'--units', 'b',
|
||||
'--options', '+lvall',
|
||||
'--reportformat', 'json',
|
||||
self.qualified_name]
|
||||
_info = subprocess.run(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
|
||||
if _info.returncode != 0:
|
||||
self.info = None
|
||||
self.created = False
|
||||
return()
|
||||
_info = json.loads(_info.stdout.decode('utf-8'))['report'][0]['vg'][0]
|
||||
for k, v in _info.items():
|
||||
# ints
|
||||
if k in ('lv_fixed_minor', 'lv_kernel_major', 'lv_kernel_minor', 'lv_kernel_read_ahead', 'lv_major',
|
||||
'lv_metadata_size', 'lv_minor', 'lv_size', 'seg_count'):
|
||||
try:
|
||||
v = int(v)
|
||||
except ValueError:
|
||||
v = 0
|
||||
# booleans - LVs apparently have a third value, "-1", which is "unknown". We translate to None.
|
||||
elif k in ('lv_active_exclusively', 'lv_active_locally', 'lv_active_remotely', 'lv_allocation_locked',
|
||||
'lv_check_needed', 'lv_converting', 'lv_device_open', 'lv_historical', 'lv_image_synced',
|
||||
'lv_inactive_table', 'lv_initial_image_sync', 'lv_live_table', 'lv_merge_failed', 'lv_merging',
|
||||
'lv_skip_activation', 'lv_snapshot_invalid', 'lv_suspended'):
|
||||
if v == '-1':
|
||||
v = None
|
||||
else:
|
||||
v = (True if int(v) == 1 else False)
|
||||
# lists
|
||||
elif k in ('lv_ancestors', 'lv_descendants', 'lv_full_ancestors', 'lv_full_descendants', 'lv_lockargs',
|
||||
'lv_modules', 'lv_permissions', 'lv_tags'):
|
||||
v = [i.strip() for i in v.split(',') if i.strip() != '']
|
||||
# date time strings
|
||||
elif k in ('lv_time', ):
|
||||
v = datetime.datetime.strptime(v, '%Y-%m-%d %H:%M:%S %z')
|
||||
elif v.strip() == '':
|
||||
v = None
|
||||
info[k] = v
|
||||
self.info = info
|
||||
return()
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@ class Member(object):
|
|||
|
||||
def _parseDeviceBlock(self):
|
||||
# I can't believe the mdstat module doesn't really have a way to do this.
|
||||
super = subprocess.run(['mdadm', '--examine', self.devpath],
|
||||
stdout = subprocess.PIPE,
|
||||
stderr = subprocess.PIPE)
|
||||
if super.returncode != 0:
|
||||
_super = subprocess.run(['mdadm', '--examine', self.devpath],
|
||||
stdout = subprocess.PIPE,
|
||||
stderr = subprocess.PIPE)
|
||||
if _super.returncode != 0:
|
||||
# TODO: logging?
|
||||
self.is_superblocked = False
|
||||
self.superblock = None
|
||||
|
|
|
|||
Loading…
Reference in New Issue