mon: health WARN if monitor quorum is incomplete

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 39f9cc84c80205852ae4ffb66d46691be8f13f93..496e6071fde4c33e664861152b33c79b35f5b76f 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -253,3 +253,16 @@ void MonmapMonitor::tick()
   update_from_paxos();
 }
 
+enum health_status_t MonmapMonitor::get_health(std::ostream &ss) const
+{
+  enum health_status_t ret(HEALTH_OK);
+  
+  int max = mon->monmap->size();
+  int actual = mon->get_quorum().size();
+  if (actual < max) {
+    ret = HEALTH_WARN;
+    ss << (max-actual) << " mons down, quorum " << mon->get_quorum();
+  }
+
+  return ret;
+}

diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h
index 58f28441ccf1b0572d738b0a77b8161fce93c70a..406dcc96df7f7a92ce8ab8362e17305bd36b8854 100644 (file)
--- a/src/mon/MonmapMonitor.h
+++ b/src/mon/MonmapMonitor.h
@@ -54,6 +54,7 @@ class MonmapMonitor : public PaxosService {
   bool preprocess_command(MMonCommand *m);
   bool prepare_command(MMonCommand *m);
 
+  enum health_status_t get_health(std::ostream &ss) const;
 
   /*
    * Since monitors are pretty