]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: account for 'damaged' in MDSMap::is_degraded
authorJohn Spray <john.spray@redhat.com>
Thu, 26 Mar 2015 12:51:30 +0000 (12:51 +0000)
committerJohn Spray <john.spray@redhat.com>
Thu, 26 Mar 2015 13:11:44 +0000 (13:11 +0000)
Fixes: #11218
Signed-off-by: John Spray <john.spray@redhat.com>
src/mds/MDSMap.h

index 481641e30ca5e4c36eb7fcf5d5f20509193930af..b0818e5d5a08205b9586ce8f0b96a6e9848fe5f3 100644 (file)
@@ -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();