mon: fix full osd detail

And use a helper to avoid dup code.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 011ee2534b48430217ca2a962def5887aef8849f..ff0f0a9c21a89f2c7ade055347c428600f38d099 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1229,35 +1229,26 @@ void PGMonitor::get_health(list<pair<health_status_t,string> >& summary,
       detail->push_back(make_pair(HEALTH_WARN, "recovery " + rss.str()));
   }
   
-  if (pg_map.nearfull_osds.size() > 0) {
-    ostringstream ss;
-    ss << pg_map.nearfull_osds.size() << " near full osd(s)";
-    summary.push_back(make_pair(HEALTH_WARN, ss.str()));
-    if (detail) {
-      for (set<int>::iterator p = pg_map.nearfull_osds.begin();
-          p != pg_map.nearfull_osds.end();
-          ++p) {
-       ostringstream ss;
-       const osd_stat_t& os = pg_map.osd_stat.find(*p)->second;
-       int ratio = (int)(((float)os.kb_used) / (float) os.kb * 100.0);
-       ss << "osd." << *p << " is near full at " << ratio << "%";
-       detail->push_back(make_pair(HEALTH_WARN, ss.str()));
-      }
-    }
-  }
-  if (pg_map.full_osds.size() > 0) {
+  check_full_osd_health(summary, detail, pg_map.full_osds, "full", HEALTH_ERR);
+  check_full_osd_health(summary, detail, pg_map.nearfull_osds, "near full", HEALTH_WARN);
+}
+
+void PGMonitor::check_full_osd_health(list<pair<health_status_t,string> >& summary,
+                                     list<pair<health_status_t,string> > *detail,
+                                     const set<int>& s, const char *desc,
+                                     health_status_t sev) const
+{
+  if (s.size() > 0) {
     ostringstream ss;
-    ss << pg_map.full_osds.size() << " full osd(s)";
-    summary.push_back(make_pair(HEALTH_WARN, ss.str()));
+    ss << s.size() << " " << desc << " osd(s)";
+    summary.push_back(make_pair(sev, ss.str()));
     if (detail) {
-      for (set<int>::iterator p = pg_map.nearfull_osds.begin();
-          p != pg_map.nearfull_osds.end();
-          ++p) {
+      for (set<int>::const_iterator p = s.begin(); p != s.end(); ++p) {
        ostringstream ss;
        const osd_stat_t& os = pg_map.osd_stat.find(*p)->second;
        int ratio = (int)(((float)os.kb_used) / (float) os.kb * 100.0);
-       ss << "osd." << *p << " is full at " << ratio << "%";
-       detail->push_back(make_pair(HEALTH_WARN, ss.str()));
+       ss << "osd." << *p << " is " << desc << " at " << ratio << "%";
+       detail->push_back(make_pair(sev, ss.str()));
       }
     }
   }

diff --git a/src/mon/PGMonitor.h b/src/mon/PGMonitor.h
index aa0eda73fb592392a492952af41fb420bab6a4e0..dad27db892bc0243acf27b86a9e90c77a4a5d285 100644 (file)
--- a/src/mon/PGMonitor.h
+++ b/src/mon/PGMonitor.h
@@ -138,6 +138,9 @@ public:
 
   void get_health(list<pair<health_status_t,string> >& summary,
                  list<pair<health_status_t,string> > *detail) const;
+  void check_full_osd_health(list<pair<health_status_t,string> >& summary,
+                            list<pair<health_status_t,string> > *detail,
+                            const set<int>& s, const char *desc, health_status_t sev) const;
 
 private:
   // no copying allowed