]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/prometheus: initializing osd_dev_node = None 31587/head
authorjiahuizeng <jhzeng93@foxmail.com>
Fri, 25 Oct 2019 09:45:09 +0000 (17:45 +0800)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Wed, 13 Nov 2019 04:47:19 +0000 (11:47 +0700)
Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit d7e84a0be1d6113d527a3b525647041775f643e2)

src/pybind/mgr/prometheus/module.py

index a28e0416f06a037f64bc22874f0f523986903ac6..7accd02393e0a844f8d99906272e62cf2cc62d02 100644 (file)
@@ -508,6 +508,7 @@ class Module(MgrModule):
                     'osd.{}'.format(id_),
                 ))
 
+            osd_dev_node = None
             if obj_store == "filestore":
             # collect filestore backend device
                 osd_dev_node = osd_metadata.get('backend_filestore_dev_node', None)
@@ -521,8 +522,6 @@ class Module(MgrModule):
                 osd_wal_dev_node = osd_metadata.get('bluefs_wal_dev_node', '')
             # collect bluestore db backend
                 osd_db_dev_node = osd_metadata.get('bluefs_db_dev_node', '')
-            else:
-                osd_dev_node = "unknown"
             if osd_dev_node and osd_dev_node == "unknown":
                 osd_dev_node = None