From 3ed7f2dd4345633ff34017b201082f4c261ef387 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 16 Jun 2014 17:00:51 -0700 Subject: [PATCH] mon: ensure HealthService warning(s) include a summary The low disk space check would change our status to HEALTH_WARN and include a detail message, but no summary. We need both. Backport: firefly Signed-off-by: Sage Weil --- src/mon/DataHealthService.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mon/DataHealthService.cc b/src/mon/DataHealthService.cc index 72b3fbfde72c..28986760d1a2 100644 --- a/src/mon/DataHealthService.cc +++ b/src/mon/DataHealthService.cc @@ -88,7 +88,7 @@ void DataHealthService::get_health( string health_detail; if (stats.latest_avail_percent <= g_conf->mon_data_avail_crit) { health_status = HEALTH_ERR; - health_detail = "shutdown imminent"; + health_detail = "low disk space, shutdown imminent"; } else if (stats.latest_avail_percent <= g_conf->mon_data_avail_warn) { health_status = HEALTH_WARN; health_detail = "low disk space"; @@ -106,13 +106,13 @@ void DataHealthService::get_health( health_detail.append(ss.str()); } - - if (detail && health_status != HEALTH_OK) { + if (health_status != HEALTH_OK) { stringstream ss; - ss << "mon." << mon_name << " addr " << it->first.addr - << " has " << stats.latest_avail_percent - << "% avail disk space -- " << health_detail; - detail->push_back(make_pair(health_status, ss.str())); + ss << "mon." << mon_name << " " << health_detail; + summary.push_back(make_pair(health_status, ss.str())); + ss << " -- " << stats.latest_avail_percent << "% avail"; + if (detail) + detail->push_back(make_pair(health_status, ss.str())); } if (f) { -- 2.47.3