From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 16 Jan 2017 07:58:15 +0000 (+0800)
Subject: mds: fix MDSMap::is_resolving()
X-Git-Tag: v12.0.0~43^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=304e47210354a62eda2f297e147dc05c1ec28ff0;p=ceph.git

mds: fix MDSMap::is_resolving()

the function checks if all recovering mds reach resolve state.
it needs to consider damaged mds set.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index d05a6530b0c..f76bdfa5ca3 100644
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -556,7 +556,7 @@ public:
     return
       get_num_mds(STATE_RESOLVE) > 0 &&
       get_num_mds(STATE_REPLAY) == 0 &&
-      failed.empty();
+      failed.empty() && damaged.empty();
   }
   bool is_rejoining() const {
     // nodes are rejoining cache state