From: Boris Ranto <branto@redhat.com>
Date: Sat, 7 Oct 2017 09:28:09 +0000 (+0200)
Subject: collectors: No update on fetch osd_stats failure
X-Git-Tag: v1.0~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d93227f72bdfa7b54aba804e04a4ff71c0064ca;p=cephmetrics.git

collectors: No update on fetch osd_stats failure

We currently do not check that we were able to successfully fetch the
osd_stas for a given osd_id which can result in collectors being down
for a while. We should check that we were able to fetch them before we
actually try to update them.

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/collectors/osd.py b/collectors/osd.py
index 749d690..88b4f2f 100644
--- a/collectors/osd.py
+++ b/collectors/osd.py
@@ -295,8 +295,12 @@ class OSDs(BaseCollector):
             if osd_type in OSDs.supported_object_stores:
 
                 osd_stats = self._fetch_osd_stats(osd_id, osd_type)
-                osd_device = self.osd[osd_id]
-                osd_device.update(osd_stats)
+                if osd_stats:
+                    osd_device = self.osd[osd_id]
+                    osd_device.update(osd_stats)
+                else:
+                    self.logger.warning("OSD stats for osd.{} not "
+                                        "available".format(osd_id))
 
             else:
                 self.logger.warning("Unknown OSD type encountered for "