]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix MDSMap::is_rejoining()
authorYan, Zheng <zyan@redhat.com>
Tue, 20 Dec 2016 08:52:02 +0000 (16:52 +0800)
committerYan, Zheng <zyan@redhat.com>
Tue, 10 Jan 2017 07:19:23 +0000 (15:19 +0800)
the function checks if all recovering mds reach rejoin state. It
need to consider damaged mds set.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
src/mds/MDSMap.h

index bde8864b6f2649e1b9c23ad31281a46b53ee8b0f..d05a6530b0c4969a7a03e125f92b712097246aa0 100644 (file)
@@ -565,7 +565,7 @@ public:
       get_num_mds(STATE_REPLAY) == 0 &&
       get_num_mds(STATE_RECONNECT) == 0 &&
       get_num_mds(STATE_RESOLVE) == 0 &&
-      failed.empty();
+      failed.empty() && damaged.empty();
   }
   bool is_stopped() const {
     return up.empty();