From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 24 Jul 2017 07:58:23 +0000 (+0800)
Subject: mon/PGMap: make plurals be more compatible with existing codes
X-Git-Tag: v12.1.2~86^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8dc7b5dfe60af454f60b53a3ddf5e91733d31480;p=ceph-ci.git

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 1b5ce757c1b..dae60cb3468 100644
--- 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;