From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 4 Aug 2017 20:00:47 +0000 (-0700)
Subject: mds: MDS_DAMAGED to MDS_DAMAGE
X-Git-Tag: v12.1.3~74^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d4f3e30450edc35326ffd3e1fb18e6ffc344786;p=ceph.git

mds: MDS_DAMAGED to MDS_DAMAGE

We had both and MDS_DAMAGE looks to be the right/intended one.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/cephfs/overrides/whitelist_health.yaml b/qa/cephfs/overrides/whitelist_health.yaml
index 467db9a9b5f0..ddd8eab69487 100644
--- a/qa/cephfs/overrides/whitelist_health.yaml
+++ b/qa/cephfs/overrides/whitelist_health.yaml
@@ -6,4 +6,4 @@ overrides:
       - \(MDS_FAILED\)
       - \(MDS_DEGRADED\)
       - \(FS_WITH_FAILED_MDS\)
-      - \(MDS_DAMAGED\)
+      - \(MDS_DAMAGE\)
diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index 3ef6de356702..1d38f19f498e 100644
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -408,9 +408,9 @@ void MDSMap::get_health(list<pair<health_status_t,string> >& summary,
 
 void MDSMap::get_health_checks(health_check_map_t *checks) const
 {
-  // MDS_DAMAGED
+  // MDS_DAMAGE
   if (!damaged.empty()) {
-    health_check_t& check = checks->get_or_add("MDS_DAMAGED", HEALTH_ERR,
+    health_check_t& check = checks->get_or_add("MDS_DAMAGE", HEALTH_ERR,
 					"%num% mds daemon%plurals% damaged");
     for (auto p : damaged) {
       std::ostringstream oss;