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

orchestrator: support complex osd creation

Browse Source 
This adds the support of complex OSD creation with command
`orch daemon add osd`.
Any argument supported by `DriveGroupSpec()` can be passed on the command line.

Usage:
```
ceph orch daemon add osd host:data_devices=device1,device2,db_devices=device3,osds_per_device=2,...
```

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
This commit is contained in:
Guillaume Abrioux 2022-03-23 10:04:45 +01:00
parent 3a88547559
commit 8aa2f4745a
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/cephadm/services/osd.rst
View File

@ -138,6 +138,12 @@ There are a few ways to create new OSDs:
ceph orch daemon add osd host1:/dev/sdb
Advanced OSD creation from specific devices on a specific host:
.. prompt:: bash #
ceph orch daemon add osd host1:data_devices=/dev/sda,/dev/sdb,db_devices=/dev/sdc,osds_per_device=2
* You can use :ref:`drivegroups` to categorize device(s) based on their
properties. This might be useful in forming a clearer picture of which
devices are available to consume. Properties include device type (SSD or

33
src/pybind/mgr/orchestrator/module.py
View File

@ -792,17 +792,42 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule,
usage = """
Usage:
ceph orch daemon add osd host:device1,device2,...
ceph orch daemon add osd host:data_devices=device1,device2,db_devices=device3,osds_per_device=2,...
"""
if not svc_arg:
return HandleCommandResult(-errno.EINVAL, stderr=usage)
try:
host_name, block_device = svc_arg.split(":")
block_devices = block_device.split(',')
devs = DeviceSelection(paths=block_devices)
host_name, raw = svc_arg.split(":")
drive_group_spec = {
'data_devices': []
} # type: Dict
drv_grp_spec_arg = None
values = raw.split(',')
while values:
v = values[0].split(',', 1)[0]
if '=' in v:
drv_grp_spec_arg, value = v.split('=')
if drv_grp_spec_arg in ['data_devices',
'db_devices',
'wal_devices',
'journal_devices']:
drive_group_spec[drv_grp_spec_arg] = []
drive_group_spec[drv_grp_spec_arg].append(value)
else:
drive_group_spec[drv_grp_spec_arg] = value
elif drv_grp_spec_arg is not None:
drive_group_spec[drv_grp_spec_arg].append(v)
else:
drive_group_spec['data_devices'].append(v)
values.remove(v)
for dev_type in ['data_devices', 'db_devices', 'wal_devices', 'journal_devices']:
drive_group_spec[dev_type] = DeviceSelection(paths=drive_group_spec[dev_type]) if drive_group_spec.get(dev_type) else None
drive_group = DriveGroupSpec(
placement=PlacementSpec(host_pattern=host_name),
data_devices=devs,
method=method,
**drive_group_spec,
)
except (TypeError, KeyError, ValueError) as e:
msg = f"Invalid 'host:device' spec: '{svc_arg}': {e}" + usage