]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or...
authorjiahuizeng <jhzeng93@foxmail.com>
Tue, 24 Sep 2019 03:01:20 +0000 (11:01 +0800)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Wed, 13 Nov 2019 04:47:19 +0000 (11:47 +0700)
Fixes: https://tracker.ceph.com/issues/42017
Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit f5b51a35930bda5499531c75f0c80816afe4ab24)

src/pybind/mgr/prometheus/module.py

index e610e1cd316ad9fbff301e093c434c7f846ddf2e..a28e0416f06a037f64bc22874f0f523986903ac6 100644 (file)
@@ -521,6 +521,8 @@ 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