From: John Spray <john.spray@redhat.com>
Date: Thu, 26 Mar 2015 12:51:30 +0000 (+0000)
Subject: mds: account for 'damaged' in MDSMap::is_degraded
X-Git-Tag: v9.0.0~77^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7eccf920bafd5d565790bb8c24667180c3cf74fc;p=ceph.git

mds: account for 'damaged' in MDSMap::is_degraded

Fixes: #11218
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index 481641e30ca5..b0818e5d5a08 100644
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -520,7 +520,7 @@ public:
     return mds_rank_t(in.size()) >= max_mds;
   }
   bool is_degraded() const {   // degraded = some recovery in process.  fixes active membership and recovery_set.
-    if (!failed.empty())
+    if (!failed.empty() || !damaged.empty())
       return true;
     for (std::map<mds_gid_t,mds_info_t>::const_iterator p = mds_info.begin();
 	 p != mds_info.end();