mds: fix health checks for multiple filesystems

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index f44eadf3c3f4441c2b510c86b8e07c11d2357524..e4b7a051396117a225cb3252b99175b38484aab3 100644 (file)
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -358,9 +358,8 @@ void FSMap::get_health_checks(health_check_map_t *checks) const
     }
 
     // FS_WITH_FAILED_MDS
-    // MDS_FAILED
     if (!stuck_failed.empty()) {
-      health_check_t& fscheck = checks->add(
+      health_check_t& fscheck = checks->get_or_add(
         "FS_WITH_FAILED_MDS", HEALTH_WARN,
         "%num% filesystem%plurals% %isorare% have a failed mds daemon");
       ostringstream ss;
@@ -379,7 +378,7 @@ void FSMap::get_health_checks(health_check_map_t *checks) const
   if (standby_count_wanted) {
     std::ostringstream oss, dss;
     oss << "insufficient standby daemons available";
-    auto& d = checks->add("MDS_INSUFFICIENT_STANDBY", HEALTH_WARN, oss.str());
+    auto& d = checks->get_or_add("MDS_INSUFFICIENT_STANDBY", HEALTH_WARN, oss.str());
     dss << "have " << standby_daemons.size() << "; want " << standby_count_wanted
        << " more";
     d.detail.push_back(dss.str());

diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index 5b1ecea10b05c11e33f9343ae3751c079b44e3ec..3ef6de3567021f62404e6b0add4472d0a638261f 100644 (file)
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -410,7 +410,7 @@ void MDSMap::get_health_checks(health_check_map_t *checks) const
 {
   // MDS_DAMAGED
   if (!damaged.empty()) {
-    health_check_t& check = checks->add("MDS_DAMAGED", HEALTH_ERR,
+    health_check_t& check = checks->get_or_add("MDS_DAMAGED", HEALTH_ERR,
                                        "%num% mds daemon%plurals% damaged");
     for (auto p : damaged) {
       std::ostringstream oss;
@@ -421,7 +421,7 @@ void MDSMap::get_health_checks(health_check_map_t *checks) const
 
   // FS_DEGRADED
   if (is_degraded()) {
-    health_check_t& fscheck = checks->add(
+    health_check_t& fscheck = checks->get_or_add(
       "FS_DEGRADED", HEALTH_WARN,
       "%num% filesystem%plurals% %isorare% degraded");
     ostringstream ss;