From: Konstantin Shalygin Date: Thu, 21 Feb 2019 07:22:21 +0000 (+0700) Subject: mgr/prometheus: get osd_objectstore once instead twice. X-Git-Tag: v12.2.12~13^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1035108fece17854b9054eaa47c34b105639aee;p=ceph.git mgr/prometheus: get osd_objectstore once instead twice. 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 (cherry picked from commit bf3231ba17c7eaada8a24e8cd8a57b8ec6216dc4) --- diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index 289032fbe197..854a31590711 100644 --- a/src/pybind/mgr/prometheus/module.py +++ b/src/pybind/mgr/prometheus/module.py @@ -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