]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/prometheus: get osd_objectstore once instead twice. 26535/head
authorKonstantin Shalygin <k0ste@k0ste.ru>
Thu, 21 Feb 2019 07:22:21 +0000 (14:22 +0700)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Wed, 27 Feb 2019 04:13:55 +0000 (11:13 +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>
(cherry picked from commit bf3231ba17c7eaada8a24e8cd8a57b8ec6216dc4)

src/pybind/mgr/prometheus/module.py

index 289032fbe1970fab96631957e88a1341a63a5d86..854a3159071185936724cd9eeff9f440c1030a22 100644 (file)
@@ -493,14 +493,13 @@ 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)
             # collect bluestore wal backend