From: Guillaume Abrioux <gabrioux@ibm.com>
Date: Fri, 3 Mar 2023 14:54:15 +0000 (+0100)
Subject: Merge pull request #50144 from guits/wip-58735-quincy
X-Git-Tag: v17.2.6~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ab7f9036aa9a8588e6eaea061eae5a9d1ca20a2;p=ceph.git

Merge pull request #50144 from guits/wip-58735-quincy

quincy: ceph-volume: do not raise RuntimeError in util.lsblk
---

7ab7f9036aa9a8588e6eaea061eae5a9d1ca20a2
diff --cc src/ceph-volume/ceph_volume/util/disk.py
index b2ab933d55ae,c113387a8f5d..544848a9a391
--- a/src/ceph-volume/ceph_volume/util/disk.py
+++ b/src/ceph-volume/ceph_volume/util/disk.py
@@@ -238,13 -238,12 +238,14 @@@ def _udevadm_info(device)
  
  
  def lsblk(device, columns=None, abspath=False):
 -    result = lsblk_all(device=device,
 -                       columns=columns,
 -                       abspath=abspath)
 +    result = []
 +    if not os.path.isdir(device):
 +        result = lsblk_all(device=device,
 +                           columns=columns,
 +                           abspath=abspath)
      if not result:
-         raise RuntimeError(f"{device} not found is lsblk report")
+         logger.debug(f"{device} not found is lsblk report")
+         return {}
  
      return result[0]