From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 17 Feb 2017 02:51:43 +0000 (+0800)
Subject: mds: don't call kick_discovers() for recovering mds twice
X-Git-Tag: v12.0.1~266^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fee353b3e26365ad1f5f79505e74b9dee3886f9d;p=ceph.git

mds: don't call kick_discovers() for recovering mds twice

MDSRankDispatcher::handle_mds_map() calls kick_discovers() when
the recovering mds enters rejoin state. No need to call it again
when the recovering mds entry clientreplay/active state.

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

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 6aa92064e1ef..2102afeec3df 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3070,7 +3070,6 @@ void MDCache::handle_mds_recovery(mds_rank_t who)
     }
   }
 
-  kick_discovers(who);
   kick_open_ino_peers(who);
   kick_find_ino_peers(who);