]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon/PGMap: fix summary form for bluestore health alerts
authorSage Weil <sage@redhat.com>
Wed, 31 Jul 2019 06:39:28 +0000 (01:39 -0500)
committerSage Weil <sage@redhat.com>
Thu, 15 Aug 2019 01:40:08 +0000 (20:40 -0500)
Count goes first.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/PGMap.cc

index 3481dbef2d97b066db9e581de0d93e8efb4ae31f..49abf35935f1327d267f33c171c19114e9cbca4d 100644 (file)
@@ -3059,21 +3059,18 @@ void PGMap::get_health_checks(
     }
 
     for (auto& asum : os_alerts_sum) {
-      string summary;
+      string summary = stringify(asum.second.first) + " OSD(s)";
       if (asum.first == "BLUEFS_SPILLOVER") {
-       summary = "BlueFS spillover detected";
+       summary += " experiencing BlueFS spillover";
       } else if (asum.first == "BLUESTORE_NO_COMPRESSION") {
-       summary = "BlueStore compression broken";
+       summary = " have broken BlueStore compression";
       } else if (asum.first == "BLUESTORE_LEGACY_STATFS") {
-       summary = "Legacy BlueStore stats reporting detected";
+       summary = " reporting legacy (not per-pool) BlueStore stats";
       } else if (asum.first == "BLUESTORE_DISK_SIZE_MISMATCH") {
-       summary = "BlueStore has dangerous mismatch between block device and free list sizes";
+       summary = " have dangerous mismatch between BlueStore block device and free list sizes";
       } else if (asum.first == "BLUESTORE_NO_PER_POOL_OMAP") {
-       summary = "Legacy BlueStore does not track omap usage by pool";
+       summary = " reporting legacy (not per-pool) BlueStore omap usage stats";
       }
-      summary += " on ";
-      summary += stringify(asum.second.first);
-      summary += " OSD(s)";
       auto& d = checks->add(asum.first, HEALTH_WARN, summary);
       for (auto& s : asum.second.second) {
         d.detail.push_back(s);