diff options
| author | Joao Eduardo Luis <joao.luis@inktank.com> | 2013-04-19 20:20:12 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-04-19 12:26:13 -0700 |
| commit | 9a7d1f5197cd1e7e9225d24dc2682f1de475a29c (patch) | |
| tree | 181c96acd88fda68af6a39317f4a315b82002651 | |
| parent | aa0d5f39d62a53002bbde673d6972b1dac86d968 (diff) | |
| download | ceph-9a7d1f5197cd1e7e9225d24dc2682f1de475a29c.tar.gz | |
mon: Monitor: fix timechecks get_health clobbering overall status
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
| -rw-r--r-- | src/mon/Monitor.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index c13773be817..cc8527ed7f7 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; |