From: Sage Weil <sage.weil@dreamhost.com>
Date: Sun, 24 Apr 2011 04:05:12 +0000 (-0700)
Subject: mon: consisder osd recovery state in health check
X-Git-Tag: v0.28~139^2~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6ac930361f92d747222cba9c2e932649599e2cc;p=ceph.git

mon: consisder osd recovery state in health check

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

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index a81c2877dc23b..97defe56d69ef 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -901,5 +901,15 @@ enum health_status_t PGMonitor::get_health(std::ostream &ss) const
       ss << p->second << " pgs " << p->first;
     }
   }
+
+  stringstream rss;
+  pg_map.recovery_summary(rss);
+  if (!rss.str().empty()) {
+    if (ret != HEALTH_OK)
+      ss << ", ";
+    ret = HEALTH_WARN;
+    ss << rss.str();
+  }
+
   return ret;
 }