mon/PGMap: make plurals be more compatible with existing codes

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 1b5ce757c1be00fe2d36efd387e04fb38ac294a6..dae60cb346815a7960413150232264f05aea83e2 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -3109,11 +3109,12 @@ void PGMap::get_health_checks(
       for (auto& p : warn_osd_by_max) {
        ostringstream ss;
        if (p.second.size() > 1) {
-         ss << "osds " << p.second;
+         ss << "osds " << p.second
+             << " have blocked requests > " << p.first << " sec";
        } else {
-         ss << "osd." << *p.second.begin();
+         ss << "osd." << *p.second.begin()
+             << " has blocked requests > " << p.first << " sec";
        }
-       ss << " have blocked requests > " << p.first << " sec";
        d.detail.push_back(ss.str());
        if (--left == 0) {
          break;
@@ -3130,11 +3131,12 @@ void PGMap::get_health_checks(
       for (auto& p : error_osd_by_max) {
        ostringstream ss;
        if (p.second.size() > 1) {
-         ss << "osds " << p.second;
+         ss << "osds " << p.second
+             << " have stuck requests > " << p.first << " sec";
        } else {
-         ss << "osd." << *p.second.begin();
+         ss << "osd." << *p.second.begin()
+             << " has stuck requests > " << p.first << " sec";
        }
-       ss << " have stuck requests > " << p.first << " sec";
        d.detail.push_back(ss.str());
        if (--left == 0) {
          break;