]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/prometheus: get osd_objectstore once instead twice. 26558/head
authorKonstantin Shalygin <k0ste@k0ste.ru>
Thu, 21 Feb 2019 07:22:21 +0000 (14:22 +0700)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Thu, 21 Feb 2019 07:23:01 +0000 (14:23 +0700)
After merging #25234 & #24821 separetly we get in
get_metadata_and_osd_status() double osd_metadata.get('osd_objectstore') call.

Signed-off-by: Konstantin Shalygin <k0ste@k0ste.ru>
src/pybind/mgr/prometheus/module.py

index ab92bee151120fb97c4d02f276daa4d5fd81942c..fc5e3e95c357ceadf09e0df0a84ee9d104d24047 100644 (file)
@@ -498,15 +498,14 @@ class Module(MgrModule):
                     'osd.{}'.format(id_),
                 ))
 
-            osd_objectstore = osd_metadata.get('osd_objectstore', None)
-            if osd_objectstore == "filestore":
+            if obj_store == "filestore":
                 # collect filestore backend device
                 osd_dev_node = osd_metadata.get(
                     'backend_filestore_dev_node', None)
                 # collect filestore journal device
                 osd_wal_dev_node = osd_metadata.get('osd_journal', '')
                 osd_db_dev_node = ''
-            elif osd_objectstore == "bluestore":
+            elif obj_store == "bluestore":
                 # collect bluestore backend device
                 osd_dev_node = osd_metadata.get(
                     'bluestore_bdev_dev_node', None)