From: Sage Weil <sage@redhat.com>
Date: Wed, 31 Jul 2019 06:39:28 +0000 (-0500)
Subject: mon/PGMap: fix summary form for bluestore health alerts
X-Git-Tag: v15.1.0~1877^2~13
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e4784af4ca301ce86e32a3156501fcdd1747b622;p=ceph-ci.git

mon/PGMap: fix summary form for bluestore health alerts

Count goes first.

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

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 3481dbef2d9..49abf35935f 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -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);