From: jiahuizeng Date: Fri, 25 Oct 2019 09:45:09 +0000 (+0800) Subject: mgr/prometheus: initializing osd_dev_node = None X-Git-Tag: v14.2.8~20^2~19^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99271c148d5db9225823a59cdd159ce885250b6c;p=ceph.git mgr/prometheus: initializing osd_dev_node = None Signed-off-by: jiahuizeng (cherry picked from commit d7e84a0be1d6113d527a3b525647041775f643e2) --- diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index 64cc8b4ad52..042f9449e3c 100644 --- a/src/pybind/mgr/prometheus/module.py +++ b/src/pybind/mgr/prometheus/module.py @@ -616,6 +616,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( @@ -631,8 +632,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