]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: set lvm membership for mpath type devices 52080/head
authorGuillaume Abrioux <gabrioux@ibm.com>
Wed, 14 Jun 2023 14:08:07 +0000 (14:08 +0000)
committerGuillaume Abrioux <gabrioux@ibm.com>
Thu, 15 Jun 2023 11:46:54 +0000 (13:46 +0200)
If any lvs is present, self.lvs should be set accordingly for mpath
type devices as well.
Otherwise, when re-running a command like following:

```
ceph-volume lvm batch --bluestore --no-auto  /dev/mapper/mpatha /dev/mapper/mpathb
```

fails with error : "Device /dev/mapper/mpatha has a filesystem."

where the expected behavior is:

```
--> passed data devices: 2 physical, 0 LVM
--> relative data size: 1.0
--> All data devices are unavailable

Total OSDs: 0

  Type            Path                                                    LV Size         % of device
```

Fixes: https://tracker.ceph.com/issues/61673
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 27e39e172c79e490dec0570b39c84b2354b5266b)

src/ceph-volume/ceph_volume/util/device.py

index 51605c65975f25602ab376ecf7db9a157697047d..aaca104474fbbf0bcfe2bf10b1fae8b228c81c85 100644 (file)
@@ -229,7 +229,7 @@ class Device(object):
             self.disk_api = dev
             device_type = dev.get('TYPE', '')
             # always check is this is an lvm member
-            valid_types = ['part', 'disk']
+            valid_types = ['part', 'disk', 'mpath']
             if allow_loop_devices():
                 valid_types.append('loop')
             if device_type in valid_types: