From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 28 Jul 2022 18:11:30 +0000 (+0200)
Subject: Merge pull request #47169 from guits/improve-mpath-reporting
X-Git-Tag: v18.0.0~395
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=306325a256040323c8caaf79023717e3d9d47696;p=ceph.git

Merge pull request #47169 from guits/improve-mpath-reporting

ceph-volume: improve mpath devices reporting
---

306325a256040323c8caaf79023717e3d9d47696
diff --cc src/ceph-volume/ceph_volume/util/disk.py
index 0a02fbc78136,2357e91cbcf7..4b1d5494976e
--- a/src/ceph-volume/ceph_volume/util/disk.py
+++ b/src/ceph-volume/ceph_volume/util/disk.py
@@@ -774,14 -781,16 +781,18 @@@ def get_block_devs_sysfs(_sys_block_pat
      dev_names = os.listdir(_sys_block_path)
      for dev in dev_names:
          name = kname = os.path.join("/dev", dev)
 +        if not os.path.exists(name):
 +            continue
          type_ = 'disk'
+         holders = os.listdir(os.path.join(_sys_block_path, dev, 'holders'))
          if get_file_contents(os.path.join(_sys_block_path, dev, 'removable')) == "1":
              continue
+         if holder_inner_loop():
+             continue
          dm_dir_path = os.path.join(_sys_block_path, dev, 'dm')
          if os.path.isdir(dm_dir_path):
-             type_ = 'lvm'
+             dm_type = get_file_contents(os.path.join(dm_dir_path, 'uuid'))
+             type_ = dm_type.split('-')[0].lower()
              basename = get_file_contents(os.path.join(dm_dir_path, 'name'))
              name = os.path.join("/dev/mapper", basename)
          if dev.startswith('loop'):