]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix MDSMap::is_resolving()
authorYan, Zheng <zyan@redhat.com>
Mon, 16 Jan 2017 07:58:15 +0000 (15:58 +0800)
committerYan, Zheng <zyan@redhat.com>
Wed, 18 Jan 2017 08:33:59 +0000 (16:33 +0800)
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>
src/mds/MDSMap.h

index d05a6530b0c4969a7a03e125f92b712097246aa0..f76bdfa5ca3fccf8c644fff2edf9adeafd3fe7b4 100644 (file)
@@ -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