Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename LVM volumes to something more reasonable #409

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Rename LVM volumes to something more reasonable #409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions qubes/storage/lvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import logging
import os
import subprocess
import re

import time

Expand All @@ -30,6 +31,7 @@
import qubes.storage
import qubes.utils

_suffix_re = re.compile(r'-(?:private|root|volatile)(?:-snap|-import|-[0-9]+-back)\Z')

def check_lvm_version():
#Check if lvm is very very old, like in Travis-CI
Expand Down Expand Up @@ -158,9 +160,10 @@ def get_volume(self, vid):

def list_volumes(self):
''' Return a list of volumes managed by this pool '''
volumes = []
for vid, vol_info in size_cache.items():
if not vid.startswith(self.volume_group + '/'):
volumes = set()
prefix = self.volume_group + '/vm-'
for vid, vol_info in size_cache.items(prefix):
if not vid.startswith():
continue
if vol_info['pool_lv'] != self.thin_pool:
continue
Expand Down Expand Up @@ -216,7 +219,7 @@ def usage_details(self):
'vg_name,pool_lv,name,lv_size,data_percent,lv_attr,origin,lv_metadata_size,'
'metadata_percent', '--units', 'b', '--separator', ';']

def _parse_lvm_cache(lvm_output):
def _parse_lvm_cache(lvm_output, replace=True):
result = {}

for line in lvm_output.splitlines():
Expand All @@ -225,6 +228,8 @@ def _parse_lvm_cache(lvm_output):
origin, metadata_size, metadata_percent = line.split(';', 8)
if '' in [pool_name, name, size, usage_percent]:
continue
if replace:
name = name.replace('+', '-').replace('.', '-')
name = pool_name + "/" + name
size = int(size[:-1]) # Remove 'B' suffix
usage = int(size / 100 * float(usage_percent))
Expand All @@ -241,20 +246,33 @@ def _parse_lvm_cache(lvm_output):

def init_cache(log=logging.getLogger('qubes.storage.lvm')):
cmd = _init_cache_cmd
if os.getuid() != 0:
cmd = ['sudo'] + cmd
environ = os.environ.copy()
environ['LC_ALL'] = 'C.utf8'
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
close_fds=True, env=environ)
out, err = p.communicate()
return_code = p.returncode
if return_code == 0 and err:
log.warning(err)
elif return_code != 0:
raise qubes.storage.StoragePoolException(err)

return _parse_lvm_cache(out)
def process_cmd(cmd):
if os.getuid() != 0:
cmd = ['sudo'] + cmd
environ = os.environ.copy()
environ['LC_ALL'] = 'C.utf8'
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
close_fds=True, env=environ)
out, err = p.communicate()
return_code = p.returncode
if return_code:
raise qubes.storage.StoragePoolException(err)
elif err:
log.warning(err)
return out

res = _parse_lvm_cache(process_cmd(cmd), False)
for name, _ in res:
pool, name = name.split('/')
if not name.startswith('vm-'):
continue
match_res = _suffix_re.search(name, 3)
if match_res:
match_offset = match_res.span()[0]
suffix = name[match_offset + 1:]
qube_name = name[3:match_offset]
new_name = 'vm-' + qube_name.replace('_', '+') + '.' + suffix
process_cmd(['lvm', 'lvrename', '--', pool, name, new_name])

@asyncio.coroutine
def init_cache_coro(log=logging.getLogger('qubes.storage.lvm')):
Expand Down