From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 20 Dec 2016 08:52:02 +0000 (+0800)
Subject: mds: fix MDSMap::is_rejoining()
X-Git-Tag: v12.0.0~220^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b7dd506677639c9997bce608718ab38f49ea534;p=ceph.git

mds: fix MDSMap::is_rejoining()

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>
---

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index bde8864b6f26..d05a6530b0c4 100644
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -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();