]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/prometheus: initializing osd_dev_node = None 31557/head
authorjiahuizeng <jhzeng93@foxmail.com>
Fri, 25 Oct 2019 09:45:09 +0000 (17:45 +0800)
committerJan Fajerski <jfajerski@suse.com>
Tue, 12 Nov 2019 09:26:27 +0000 (10:26 +0100)
Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit d7e84a0be1d6113d527a3b525647041775f643e2)

src/pybind/mgr/prometheus/module.py

index 0b653d0b44963e117217fbd17e229a91299e9b51..7ed51a69f3cb8acfbb0a2bdc16a3be0233ebf26c 100644 (file)
@@ -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