RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-13 14:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45126 from guits/fix-bug-cv-bz2056719

Browse Source 
ceph-volume: abort when passed devices have partitions
This commit is contained in:
Guillaume Abrioux 2022-02-24 17:25:25 +01:00 committed by GitHub
commit 4804a74619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ceph-volume/ceph_volume/devices/lvm/common.py
View File

@ -92,6 +92,7 @@ bluestore_args = {
'--block.db': {
'dest': 'block_db',
'help': 'Path to bluestore block.db logical volume or device',
'type': arg_validators.ValidDevice(as_string=True),
},
'--block.db-size': {
'dest': 'block_db_size',
@ -109,6 +110,7 @@ bluestore_args = {
'--block.wal': {
'dest': 'block_wal',
'help': 'Path to bluestore block.wal logical volume or device',
'type': arg_validators.ValidDevice(as_string=True),
},
'--block.wal-size': {
'dest': 'block_wal_size',
@ -132,6 +134,7 @@ filestore_args = {
},
'--journal': {
'help': 'A logical volume (vg_name/lv_name), or path to a device',
'type': arg_validators.ValidDevice(as_string=True),
},
'--journal-size': {
'help': 'Size of journal LV in case a raw block device was passed in --journal',

1
src/ceph-volume/ceph_volume/tests/devices/lvm/test_batch.py
View File

@ -33,6 +33,7 @@ class TestBatch(object):
mocked_device.return_value = MagicMock(
is_partition=True,
has_gpt_headers=False,
has_partitions=False,
)
with pytest.raises(ArgumentError):
arg_validators.ValidBatchDevice()('foo')

8
src/ceph-volume/ceph_volume/tests/util/test_arg_validators.py
View File

@ -3,6 +3,7 @@ import pytest
import os
from ceph_volume import exceptions
from ceph_volume.util import arg_validators
from mock.mock import patch, PropertyMock
class TestOSDPath(object):
@ -88,6 +89,13 @@ class TestValidDevice(object):
with pytest.raises(argparse.ArgumentError):
self.validator('/device/does/not/exist')
@patch('ceph_volume.util.arg_validators.Device.has_partitions', new_callable=PropertyMock, return_value=True)
@patch('ceph_volume.util.arg_validators.Device.exists', new_callable=PropertyMock, return_value=True)
@patch('ceph_volume.api.lvm.get_single_lv', return_value=None)
def test_dev_has_partitions(self, m_get_single_lv, m_exists, m_has_partitions, fake_call):
with pytest.raises(RuntimeError):
self.validator('/dev/foo')
class TestValidFraction(object):

4
src/ceph-volume/ceph_volume/util/arg_validators.py
View File

@ -41,10 +41,10 @@ class ValidDevice(object):
# __init__
elif device.has_gpt_headers and not self.gpt_ok:
error = "GPT headers found, they must be removed on: %s" % dev_path
if device.has_partitions:
raise RuntimeError("Device {} has partitions.".format(dev_path))
if error:
raise argparse.ArgumentError(None, error)
return device

11
src/ceph-volume/ceph_volume/util/device.py
View File

@ -476,6 +476,15 @@ class Device(object):
vg_free -= extent_size
return [vg_free]
@property
def has_partitions(self):
'''
Boolean to determine if a given device has partitions.
'''
if self.sys_api.get('partitions'):
return True
return False
def _check_generic_reject_reasons(self):
reasons = [
('removable', 1, 'removable'),
@ -514,6 +523,8 @@ class Device(object):
if self.has_gpt_headers:
rejected.append('Has GPT headers')
if self.has_partitions:
rejected.append('Has partitions')
return rejected
def _check_lvm_reject_reasons(self):