From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Fri, 15 Nov 2013 01:30:39 +0000 (+0800)
Subject: mds: fix sending resolve message
X-Git-Tag: v0.75~93^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87ca2604888b401d6f9ad62ec8183969a92c82d7;p=ceph.git

mds: fix sending resolve message

need to send resolve message when mds is in reconnect state

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 14080789000..c88a0240fe1 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -996,7 +996,8 @@ void MDS::handle_mds_map(MMDSMap *m)
   
   // RESOLVE
   // is someone else newly resolving?
-  if (is_resolve() || is_rejoin() || is_clientreplay() || is_active() || is_stopping()) {
+  if (is_resolve() || is_reconnect() || is_rejoin() ||
+      is_clientreplay() || is_active() || is_stopping()) {
     if (!oldmap->is_resolving() && mdsmap->is_resolving()) {
       set<int> resolve;
       mdsmap->get_mds_set(resolve, MDSMap::STATE_RESOLVE);