]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: don't use Server::finish_force_open_sessions during log replay 12274/head
authorYan, Zheng <zyan@redhat.com>
Fri, 9 Dec 2016 03:34:23 +0000 (11:34 +0800)
committerYan, Zheng <zyan@redhat.com>
Fri, 9 Dec 2016 03:34:23 +0000 (11:34 +0800)
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>
src/mds/journal.cc

index c0c6e93e5b3b7b76bc71ab1b21ec24d066f7c652..40f13f4562133de81ad8a5c862e7a368930bf3ec 100644 (file)
@@ -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());