openstack/cinder
Code Issues Proposed changes

Replace 'lvconvert' from rootwrap

Browse Source 
Use oslo.privsep to run the lvconvert command.

Change-Id: I6c2dce7beb1c3f8bb777066f62ced134f763e640
Signed-off-by: Charles Short <chucks@redhat.com>
This commit is contained in:
Charles Short 2019-01-30 13:14:09 -05:00
parent 1e698dbf39
commit ec6eaa21fd
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/brick/local_dev/lvm.py
View File

@ -747,10 +747,8 @@ class LVM(executor.Executor):
:param snapshot_name: Name of snapshot to revert :param snapshot_name: Name of snapshot to revert
""" """
cmd = ['lvconvert', '--merge', '%s/%s' % (self.vg_name, snapshot_name)]
try: try:
self._execute(*cmd, root_helper=self._root_helper, cinder.privsep.lvm.lvconvert(self.vg_name, snapshot_name)
run_as_root=True)
except putils.ProcessExecutionError as err: except putils.ProcessExecutionError as err:
LOG.exception('Error Revert Volume') LOG.exception('Error Revert Volume')
LOG.error('Cmd :%s', err.cmd) LOG.error('Cmd :%s', err.cmd)

6
cinder/privsep/lvm.py
View File

@ -36,3 +36,9 @@ def lvrename(vg_name, lv_name, new_name):
def create_vg(vg_name, pv_list): def create_vg(vg_name, pv_list):
cmd = ['vgcreate', vg_name, ','.join(pv_list)] cmd = ['vgcreate', vg_name, ','.join(pv_list)]
processutils.execute(*cmd) processutils.execute(*cmd)
@cinder.privsep.sys_admin_pctxt.entrypoint
def lvconvert(vg_name, snapshot_name):
processutils.execute(
'lvconvert', '--merge', '%s/%s' % (vg_name, snapshot_name))

3
etc/cinder/rootwrap.d/volume.filters
View File

@ -68,9 +68,6 @@ lvextend_lvmconf_fdwarn: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, LVM_SU
# cinder/brick/local_dev/lvm.py: 'lvchange -a y -K <lv>' # cinder/brick/local_dev/lvm.py: 'lvchange -a y -K <lv>'
lvchange: CommandFilter, lvchange, root lvchange: CommandFilter, lvchange, root
# cinder/brick/local_dev/lvm.py: 'lvconvert', '--merge', snapshot_name
lvconvert: CommandFilter, lvconvert, root
# cinder/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',... # cinder/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',...
# cinder/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ... # cinder/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ...
iscsiadm: CommandFilter, iscsiadm, root iscsiadm: CommandFilter, iscsiadm, root