From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Wed, 22 Feb 2023 16:56:52 +0000 (-0500)
Subject: Merge pull request #50145 from guits/wip-58736-pacific
X-Git-Tag: v16.2.13~163
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b91809f93dfd3d64b722c58545b5a4fb8949605;p=ceph.git

Merge pull request #50145 from guits/wip-58736-pacific

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

Reviewed-by: Teoman ONAY <tonay@ibm.com>
---

9b91809f93dfd3d64b722c58545b5a4fb8949605
diff --cc src/ceph-volume/ceph_volume/util/disk.py
index 1a76a8a05514,01cd4ba7fe8c..90527e2090b6
--- 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]