update ceph source to reef 18.2.1

[ceph.git] / ceph / src / python-common / ceph / deployment / drive_selection / selector.py

diff --git a/ceph/src/python-common/ceph/deployment/drive_selection/selector.py b/ceph/src/python-common/ceph/deployment/drive_selection/selector.py
index d6556dd2c0a557c73d231bf8147093f7dc44a401..1b3bfbb4ee3c5772bb61a9d6cd502b83b49d1e28 100644 (file)
--- a/ceph/src/python-common/ceph/deployment/drive_selection/selector.py
+++ b/ceph/src/python-common/ceph/deployment/drive_selection/selector.py
@@ -71,7 +71,7 @@ class DriveSelection(object):
         limit = device_filter.limit or 0
 
         if limit > 0 and (len_devices + self.existing_daemons >= limit):
-            logger.info("Refuse to add {} due to limit policy of <{}>".format(
+            logger.debug("Refuse to add {} due to limit policy of <{}>".format(
                 disk_path, limit))
             return True
         return False
@@ -131,9 +131,10 @@ class DriveSelection(object):
             if not disk.available and disk.ceph_device and disk.lvs:
                 other_osdspec_affinity = ''
                 for lv in disk.lvs:
-                    if lv['osdspec_affinity'] != self.spec.service_id:
-                        other_osdspec_affinity = lv['osdspec_affinity']
-                        break
+                    if 'osdspec_affinity' in lv.keys():
+                        if lv['osdspec_affinity'] != self.spec.service_id:
+                            other_osdspec_affinity = lv['osdspec_affinity']
+                            break
                 if other_osdspec_affinity:
                     logger.debug("{} is already used in spec {}, "
                                  "skipping it.".format(disk.path, other_osdspec_affinity))