From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Fri, 19 Apr 2013 19:20:12 +0000 (+0100)
Subject: mon: Monitor: fix timechecks get_health clobbering overall status
X-Git-Tag: v0.61~140^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a7d1f5197cd1e7e9225d24dc2682f1de475a29c;p=ceph.git

mon: Monitor: fix timechecks get_health clobbering overall status

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c13773be817e..cc8527ed7f7e 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -2259,7 +2259,8 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f)
       ostringstream tcss;
       health_status_t tcstatus = timecheck_status(tcss, skew, latency);
       if (tcstatus != HEALTH_OK) {
-        overall = tcstatus;
+        if (overall > tcstatus)
+          overall = tcstatus;
         warns.push_back(name);
 
         ostringstream tmp_ss;