import quincy beta 17.1.0

[ceph.git] / ceph / src / ceph-volume / ceph_volume / devices / raw / list.py

diff --git a/ceph/src/ceph-volume/ceph_volume/devices/raw/list.py b/ceph/src/ceph-volume/ceph_volume/devices/raw/list.py
index c86d4996f8d05699e1c5e3297ea10dbd412d9abd..50d2046daac59335081ac5e868d26462e70a9a97 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/devices/raw/list.py
+++ b/ceph/src/ceph-volume/ceph_volume/devices/raw/list.py
@@ -36,18 +36,22 @@ def _get_bluestore_info(dev):
         logger.warning('skipping device {} because it is not reported in ceph-bluestore-tool output: {}'.format(dev, out))
         return None
     try:
-        if oj[dev]['description'] != 'main':
-            # ignore non-main devices, for now
-            logger.info('ignoring non-main device {}'.format(dev))
-            return None
-        whoami = oj[dev]['whoami']
-        return {
-            'type': 'bluestore',
-            'osd_id': int(whoami),
+        r = {
             'osd_uuid': oj[dev]['osd_uuid'],
-            'ceph_fsid': oj[dev]['ceph_fsid'],
-            'device': dev
         }
+        if oj[dev]['description'] == 'main':
+            whoami = oj[dev]['whoami']
+            r.update({
+                'type': 'bluestore',
+                'osd_id': int(whoami),
+                'ceph_fsid': oj[dev]['ceph_fsid'],
+                'device': dev,
+            })
+        elif oj[dev]['description'] == 'bluefs db':
+            r['device_db'] = dev
+        elif oj[dev]['description'] == 'bluefs wal':
+            r['device_wal'] = dev
+        return r
     except KeyError as e:
         # this will appear for devices that have a bluestore header but aren't valid OSDs
         # for example, due to incomplete rollback of OSDs: https://tracker.ceph.com/issues/51869
@@ -64,7 +68,6 @@ class List(object):
 
     def generate(self, devs=None):
         logger.debug('Listing block devices via lsblk...')
-
         if devs is None or devs == []:
             devs = []
             # If no devs are given initially, we want to list ALL devices including children and
@@ -108,7 +111,10 @@ class List(object):
                 # a BlueStore disk, so be sure to log our assumption that it isn't bluestore
                 logger.info('device {} does not have BlueStore information'.format(dev))
                 continue
-            result[bs_info['osd_uuid']] = bs_info
+            uuid = bs_info['osd_uuid']
+            if uuid not in result:
+                result[uuid] = {}
+            result[uuid].update(bs_info)
 
         return result