From: Yan, Zheng <zyan@redhat.com>
Date: Fri, 9 Dec 2016 03:34:23 +0000 (+0800)
Subject: mds: don't use Server::finish_force_open_sessions during log replay
X-Git-Tag: v12.0.0~253^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=90c7e345865f06e304e4ff78f5c22436e973a593;p=ceph.git

mds: don't use Server::finish_force_open_sessions during log replay

Server::finish_force_open_sessions() send session open message to
clients. It's wrong to use it during log replay.

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

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index c0c6e93e5b3..40f13f45621 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -2132,11 +2132,9 @@ void EUpdate::replay(MDSRank *mds)
 	       << " < " << cmapv << dendl;
       // open client sessions?
       map<client_t,entity_inst_t> cm;
-      map<client_t, uint64_t> seqm;
       bufferlist::iterator blp = client_map.begin();
       ::decode(cm, blp);
-      mds->server->prepare_force_open_sessions(cm, seqm);
-      mds->server->finish_force_open_sessions(cm, seqm);
+      mds->sessionmap.open_sessions(cm);
 
       assert(mds->sessionmap.get_version() == cmapv);
       mds->sessionmap.set_projected(mds->sessionmap.get_version());