mon/PGMap: rename a few health checks

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index dccd7c0b811cd7a5c7306d79a63df9086475a894..aa44d5543491b5a87668cce6899eda2278e1be52 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -3003,7 +3003,7 @@ void PGMap::get_health_checks(
     }
   }
 
-  // DEGRADED_OBJECTS
+  // OBJECT_DEGRADED
   if (pg_sum.stats.sum.num_objects_degraded &&
       pg_sum.stats.sum.num_object_copies > 0) {
     double pc = (double)pg_sum.stats.sum.num_objects_degraded /
@@ -3014,10 +3014,10 @@ void PGMap::get_health_checks(
     ss << pg_sum.stats.sum.num_objects_degraded
        << "/" << pg_sum.stats.sum.num_object_copies << " objects degraded ("
        << b << "%)";
-    checks->add("DEGRADED_OBJECTS", HEALTH_WARN, ss.str());
+    checks->add("OBJECT_DEGRADED", HEALTH_WARN, ss.str());
   }
 
-  // MISPLACED_OBJECTS
+  // OBJECT_MISPLACED
   if (pg_sum.stats.sum.num_objects_misplaced &&
       pg_sum.stats.sum.num_object_copies > 0) {
     double pc = (double)pg_sum.stats.sum.num_objects_misplaced /
@@ -3028,10 +3028,10 @@ void PGMap::get_health_checks(
     ss << pg_sum.stats.sum.num_objects_misplaced
        << "/" << pg_sum.stats.sum.num_object_copies << " objects misplaced ("
        << b << "%)";
-    checks->add("MISPLACED_OBJECTS", HEALTH_WARN, ss.str());
+    checks->add("OBJECT_MISPLACED", HEALTH_WARN, ss.str());
   }
 
-  // UNFOUND_OBJECTS
+  // OBJECT_UNFOUND
   if (pg_sum.stats.sum.num_objects_unfound &&
       pg_sum.stats.sum.num_objects) {
     double pc = (double)pg_sum.stats.sum.num_objects_unfound /
@@ -3041,11 +3041,11 @@ void PGMap::get_health_checks(
     ostringstream ss;
     ss << pg_sum.stats.sum.num_objects_unfound
        << "/" << pg_sum.stats.sum.num_objects << " unfound (" << b << "%)";
-    checks->add("UNFOUND_OBJECTS", HEALTH_WARN, ss.str());
+    checks->add("OBJECT_UNFOUND", HEALTH_WARN, ss.str());
   }
 
-  // SLOW_REQUESTS
-  // STUCK_REQUESTS
+  // REQUEST_SLOW
+  // REQUEST_STUCK
   if (cct->_conf->mon_osd_warn_op_age > 0 &&
       osd_sum.op_queue_age_hist.upper_bound() >
       cct->_conf->mon_osd_warn_op_age) {
@@ -3096,7 +3096,7 @@ void PGMap::get_health_checks(
       ostringstream ss;
       ss << warn << " slow requests are blocked > "
         << cct->_conf->mon_osd_warn_op_age << " sec";
-      auto& d = checks->add("SLOW_REQUESTS", HEALTH_WARN, ss.str());
+      auto& d = checks->add("REQUEST_SLOW", HEALTH_WARN, ss.str());
       d.detail.swap(warn_detail);
       int left = max;
       for (auto& p : warn_osd_by_max) {
@@ -3117,7 +3117,7 @@ void PGMap::get_health_checks(
       ostringstream ss;
       ss << warn << " stuck requests are blocked > "
         << err_age << " sec";
-      auto& d = checks->add("STUCK_REQUESTS", HEALTH_ERR, ss.str());
+      auto& d = checks->add("REQUEST_STUCK", HEALTH_ERR, ss.str());
       d.detail.swap(error_detail);
       int left = max;
       for (auto& p : error_osd_by_max) {