From: jiahuizeng <jhzeng93@foxmail.com>
Date: Fri, 25 Oct 2019 09:45:09 +0000 (+0800)
Subject: mgr/prometheus: initializing osd_dev_node = None
X-Git-Tag: v13.2.9~114^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31557%2Fhead;p=ceph.git

mgr/prometheus: initializing osd_dev_node = None

Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit d7e84a0be1d6113d527a3b525647041775f643e2)
---

diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index 0b653d0b449..7ed51a69f3c 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -513,6 +513,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)
@@ -526,8 +527,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