openstack
/
nova
Code Issues Proposed changes

Move makefs to privsep 

Change-Id: I388d31d5e9c1cff10bc534ba69be899e67681ce6
blueprint: hurrah-for-privsep
This commit is contained in:
Michael Still 2017-12-12 03:28:41 +11:00
parent e94151c1c3
commit fef1435167
12 changed files with 100 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nova/privsep/fs.py
View File

@ -220,3 +220,34 @@ def ext_journal_disable(device):
@nova.privsep.sys_admin_pctxt.entrypoint
def ext_journal_enable(device):
processutils.execute('tune2fs', '-j', device)
@nova.privsep.sys_admin_pctxt.entrypoint
def mkfs(fs, path, label=None):
unprivileged_mkfs(fs, path, label=None)
# NOTE(mikal): this method is deliberately not wrapped in a privsep entrypoint
def unprivileged_mkfs(fs, path, label=None):
"""Format a file or block device
:param fs: Filesystem type (examples include 'swap', 'ext3', 'ext4'
'btrfs', etc.)
:param path: Path to file or block device to format
:param label: Volume label to use
"""
if fs == 'swap':
args = ['mkswap']
else:
args = ['mkfs', '-t', fs]
# add -F to force no interactive execute on non-block device.
if fs in ('ext3', 'ext4', 'ntfs'):
args.extend(['-F'])
if label:
if fs in ('msdos', 'vfat'):
label_opt = '-n'
else:
label_opt = '-L'
args.extend([label_opt, label])
args.append(path)
processutils.execute(*args)

39
nova/tests/unit/privsep/test_fs.py
View File

@ -32,3 +32,42 @@ class PrivsepFilesystemHelpersTestCase(test.NoDBTestCase):
self.assertEqual(2, len(partitions))
self.assertEqual((1, 2, 10, "ext3", "", "boot"), partitions[0])
self.assertEqual((2, 20, 10, "", "bob", ""), partitions[1])
class MkfsTestCase(test.NoDBTestCase):
@mock.patch('oslo_concurrency.processutils.execute')
def test_mkfs_ext4(self, mock_execute):
nova.privsep.fs.unprivileged_mkfs('ext4', '/my/block/dev')
mock_execute.assert_called_once_with('mkfs', '-t', 'ext4', '-F',
'/my/block/dev')
@mock.patch('oslo_concurrency.processutils.execute')
def test_mkfs_msdos(self, mock_execute):
nova.privsep.fs.unprivileged_mkfs('msdos', '/my/msdos/block/dev')
mock_execute.assert_called_once_with('mkfs', '-t', 'msdos',
'/my/msdos/block/dev')
@mock.patch('oslo_concurrency.processutils.execute')
def test_mkfs_swap(self, mock_execute):
nova.privsep.fs.unprivileged_mkfs('swap', '/my/swap/block/dev')
mock_execute.assert_called_once_with('mkswap', '/my/swap/block/dev')
@mock.patch('oslo_concurrency.processutils.execute')
def test_mkfs_ext4_withlabel(self, mock_execute):
nova.privsep.fs.unprivileged_mkfs('ext4', '/my/block/dev', 'ext4-vol')
mock_execute.assert_called_once_with(
'mkfs', '-t', 'ext4', '-F', '-L', 'ext4-vol', '/my/block/dev')
@mock.patch('oslo_concurrency.processutils.execute')
def test_mkfs_msdos_withlabel(self, mock_execute):
nova.privsep.fs.unprivileged_mkfs(
'msdos', '/my/msdos/block/dev', 'msdos-vol')
mock_execute.assert_called_once_with(
'mkfs', '-t', 'msdos', '-n', 'msdos-vol', '/my/msdos/block/dev')
@mock.patch('oslo_concurrency.processutils.execute')
def test_mkfs_swap_withlabel(self, mock_execute):
nova.privsep.fs.unprivileged_mkfs(
'swap', '/my/swap/block/dev', 'swap-vol')
mock_execute.assert_called_once_with(
'mkswap', '-L', 'swap-vol', '/my/swap/block/dev')

2
nova/tests/unit/test_configdrive2.py
View File

@ -64,7 +64,7 @@ class ConfigDriveTestCase(test.NoDBTestCase):
if imagefile:
fileutils.delete_if_exists(imagefile)
@mock.patch.object(utils, 'mkfs', return_value=None)
@mock.patch('nova.privsep.fs.unprivileged_mkfs', return_value=None)
@mock.patch('nova.privsep.fs.mount', return_value=('', ''))
@mock.patch('nova.privsep.fs.umount', return_value=None)
@mock.patch.object(utils, 'trycmd', return_value=(None, None))

39
nova/tests/unit/test_utils.py
View File

@ -677,45 +677,6 @@ class AuditPeriodTest(test.NoDBTestCase):
year=2011))
class MkfsTestCase(test.NoDBTestCase):
@mock.patch('nova.utils.execute')
def test_mkfs_ext4(self, mock_execute):
utils.mkfs('ext4', '/my/block/dev')
mock_execute.assert_called_once_with('mkfs', '-t', 'ext4', '-F',
'/my/block/dev', run_as_root=False)
@mock.patch('nova.utils.execute')
def test_mkfs_msdos(self, mock_execute):
utils.mkfs('msdos', '/my/msdos/block/dev')
mock_execute.assert_called_once_with('mkfs', '-t', 'msdos',
'/my/msdos/block/dev', run_as_root=False)
@mock.patch('nova.utils.execute')
def test_mkfs_swap(self, mock_execute):
utils.mkfs('swap', '/my/swap/block/dev')
mock_execute.assert_called_once_with('mkswap', '/my/swap/block/dev',
run_as_root=False)
@mock.patch('nova.utils.execute')
def test_mkfs_ext4_withlabel(self, mock_execute):
utils.mkfs('ext4', '/my/block/dev', 'ext4-vol')
mock_execute.assert_called_once_with('mkfs', '-t', 'ext4', '-F',
'-L', 'ext4-vol', '/my/block/dev', run_as_root=False)
@mock.patch('nova.utils.execute')
def test_mkfs_msdos_withlabel(self, mock_execute):
utils.mkfs('msdos', '/my/msdos/block/dev', 'msdos-vol')
mock_execute.assert_called_once_with('mkfs', '-t', 'msdos',
'-n', 'msdos-vol', '/my/msdos/block/dev', run_as_root=False)
@mock.patch('nova.utils.execute')
def test_mkfs_swap_withlabel(self, mock_execute):
utils.mkfs('swap', '/my/swap/block/dev', 'swap-vol')
mock_execute.assert_called_once_with('mkswap', '-L', 'swap-vol',
'/my/swap/block/dev', run_as_root=False)
class MetadataToDictTestCase(test.NoDBTestCase):
def test_metadata_to_dict(self):
self.assertEqual(utils.metadata_to_dict(

35
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -11952,15 +11952,14 @@ class LibvirtConnTestCase(test.NoDBTestCase,
fake_backend.disks['disk'].create_snap.assert_called_once_with(
libvirt_utils.RESIZE_SNAPSHOT_NAME)
@mock.patch.object(utils, 'execute')
def test_create_ephemeral_specified_fs(self, mock_exec):
@mock.patch('nova.privsep.fs.mkfs')
def test_create_ephemeral_specified_fs(self, fake_mkfs):
self.flags(default_ephemeral_format='ext3')
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
drvr._create_ephemeral('/dev/something', 20, 'myVol', 'linux',
is_block_dev=True, specified_fs='ext4')
mock_exec.assert_called_once_with('mkfs', '-t', 'ext4', '-F', '-L',
'myVol', '/dev/something',
run_as_root=True)
fake_mkfs.assert_has_calls([mock.call('ext4', '/dev/something',
'myVol')])
@mock.patch('nova.privsep.path.utime')
def test_create_ephemeral_specified_fs_not_valid(self, mock_utime):
@ -11995,24 +11994,22 @@ class LibvirtConnTestCase(test.NoDBTestCase,
context, instance, disk_info['mapping'],
block_device_info=block_device_info)
def test_create_ephemeral_default(self):
@mock.patch('nova.privsep.fs.mkfs')
def test_create_ephemeral_default(self, fake_mkfs):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
self.mox.StubOutWithMock(utils, 'execute')
utils.execute('mkfs', '-t', 'ext4', '-F', '-L', 'myVol',
'/dev/something', run_as_root=True)
self.mox.ReplayAll()
drvr._create_ephemeral('/dev/something', 20, 'myVol', 'linux',
is_block_dev=True)
fake_mkfs.assert_has_calls([mock.call('ext4', '/dev/something',
'myVol')])
def test_create_ephemeral_with_conf(self):
@mock.patch('nova.privsep.fs.mkfs')
def test_create_ephemeral_with_conf(self, fake_mkfs):
CONF.set_override('default_ephemeral_format', 'ext4')
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
self.mox.StubOutWithMock(utils, 'execute')
utils.execute('mkfs', '-t', 'ext4', '-F', '-L', 'myVol',
'/dev/something', run_as_root=True)
self.mox.ReplayAll()
drvr._create_ephemeral('/dev/something', 20, 'myVol', 'linux',
is_block_dev=True)
fake_mkfs.assert_has_calls([mock.call('ext4', '/dev/something',
'myVol')])
def test_create_ephemeral_with_arbitrary(self):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
@ -12048,13 +12045,11 @@ class LibvirtConnTestCase(test.NoDBTestCase,
'/dev/something',
'20G', 'fs_format')
def test_create_swap_default(self):
@mock.patch('nova.privsep.fs.unprivileged_mkfs')
def test_create_swap_default(self, fake_mkfs):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
self.mox.StubOutWithMock(utils, 'execute')
utils.execute('mkswap', '/dev/something', run_as_root=False)
self.mox.ReplayAll()
drvr._create_swap('/dev/something', 1)
fake_mkfs.assert_has_calls([mock.call('swap', '/dev/something')])
def test_ensure_console_log_for_instance_pass(self):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)

10
nova/tests/unit/virt/xenapi/test_vm_utils.py
View File

@ -995,8 +995,8 @@ class VDIOtherConfigTestCase(VMUtilsTestBase):
class GenerateDiskTestCase(VMUtilsTestBase):
@mock.patch.object(vm_utils, 'vdi_attached')
@mock.patch.object(vm_utils.utils, 'mkfs',
side_effect = test.TestingException())
@mock.patch('nova.privsep.fs.mkfs',
side_effect = test.TestingException())
@mock.patch.object(vm_utils, '_get_dom0_ref', return_value='dom0_ref')
@mock.patch.object(vm_utils, 'safe_find_sr', return_value='sr_ref')
@mock.patch.object(vm_utils, 'create_vdi', return_value='vdi_ref')
@ -1021,7 +1021,7 @@ class GenerateDiskTestCase(VMUtilsTestBase):
bootable=False)
@mock.patch.object(vm_utils, 'vdi_attached')
@mock.patch.object(vm_utils.utils, 'mkfs')
@mock.patch('nova.privsep.fs.mkfs')
@mock.patch.object(vm_utils, '_get_dom0_ref', return_value='dom0_ref')
@mock.patch.object(vm_utils, 'safe_find_sr', return_value='sr_ref')
@mock.patch.object(vm_utils, 'create_vdi', return_value='vdi_ref')
@ -1054,7 +1054,7 @@ class GenerateDiskTestCase(VMUtilsTestBase):
bootable=False)
@mock.patch.object(vm_utils, 'vdi_attached')
@mock.patch.object(vm_utils.utils, 'mkfs')
@mock.patch('nova.privsep.fs.mkfs')
@mock.patch.object(vm_utils, '_get_dom0_ref', return_value='dom0_ref')
@mock.patch.object(vm_utils, 'safe_find_sr', return_value='sr_ref')
@mock.patch.object(vm_utils, 'create_vdi', return_value='vdi_ref')
@ -1082,7 +1082,7 @@ class GenerateDiskTestCase(VMUtilsTestBase):
mock_attached_here.assert_any_call(session, 'vdi_ref',
read_only=False)
mock_mkfs.assert_called_with('ext4', '/dev/fake_devp1',
'ephemeral-1', run_as_root=True)
'ephemeral-1')
mock_create_vbd.assert_called_with(session, 'vm_ref', 'vdi_ref', '2',
bootable=False)

3
nova/tests/unit/virt/xenapi/test_xenapi.py
View File

@ -904,7 +904,8 @@ class XenAPIVMTestCase(stubs.XenAPITestBase,
os_type="linux", architecture="x86-64")
self.check_vm_params_for_linux()
def test_spawn_vhd_glance_windows(self):
@mock.patch('nova.privsep.fs.mkfs')
def test_spawn_vhd_glance_windows(self, fake_mkfs):
self._test_spawn(IMAGE_VHD, None, None,
os_type="windows", architecture="i386",
instance_type_id=5)

25
nova/utils.py
View File

@ -723,31 +723,6 @@ class UndoManager(object):
self._rollback()
def mkfs(fs, path, label=None, run_as_root=False):
"""Format a file or block device
:param fs: Filesystem type (examples include 'swap', 'ext3', 'ext4'
'btrfs', etc.)
:param path: Path to file or block device to format
:param label: Volume label to use
"""
if fs == 'swap':
args = ['mkswap']
else:
args = ['mkfs', '-t', fs]
# add -F to force no interactive execute on non-block device.
if fs in ('ext3', 'ext4', 'ntfs'):
args.extend(['-F'])
if label:
if fs in ('msdos', 'vfat'):
label_opt = '-n'
else:
label_opt = '-L'
args.extend([label_opt, label])
args.append(path)
execute(*args, run_as_root=run_as_root)
def metadata_to_dict(metadata, include_deleted=False):
result = {}
for item in metadata:

2
nova/virt/configdrive.py
View File

@ -103,7 +103,7 @@ class ConfigDriveBuilder(object):
with open(path, 'wb') as f:
f.truncate(CONFIGDRIVESIZE_BYTES)
utils.mkfs('vfat', path, label='config-2')
nova.privsep.fs.unprivileged_mkfs('vfat', path, label='config-2')
with utils.tempdir() as mountdir:
mounted = False

5
nova/virt/disk/api.py
View File

@ -117,7 +117,10 @@ def mkfs(os_type, fs_label, target, run_as_root=True, specified_fs=None):
specified_fs = _DEFAULT_FS_BY_OSTYPE.get(os_type,
_DEFAULT_FILE_SYSTEM)
utils.mkfs(specified_fs, target, fs_label, run_as_root=run_as_root)
if run_as_root:
nova.privsep.fs.mkfs(specified_fs, target, fs_label)
else:
nova.privsep.fs.unprivileged_mkfs(specified_fs, target, fs_label)
def resize2fs(image, check_exit_code=False, run_as_root=False):

2
nova/virt/libvirt/driver.py
View File

@ -3177,7 +3177,7 @@ class LibvirtDriver(driver.ComputeDriver):
def _create_swap(target, swap_mb, context=None):
"""Create a swap file of specified size."""
libvirt_utils.create_image('raw', target, '%dM' % swap_mb)
utils.mkfs('swap', target)
nova.privsep.fs.unprivileged_mkfs('swap', target)
@staticmethod
def _get_console_log_path(instance):

3
nova/virt/xenapi/vm_utils.py
View File

@ -1038,8 +1038,7 @@ def _generate_disk(session, instance, vm_ref, userdevice, name_label,
if fs_type is not None and not mkfs_in_dom0:
with vdi_attached(session, vdi_ref, read_only=False) as dev:
partition_path = utils.make_dev_path(dev, partition=1)
utils.mkfs(fs_type, partition_path, fs_label,
run_as_root=True)
nova.privsep.fs.mkfs(fs_type, partition_path, fs_label)
# 4. Create VBD between instance VM and VDI
if vm_ref: