From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 8 Dec 2016 02:25:18 +0000 (+0800)
Subject: mds: fix sessionmap version increasement when replaying ESessions
X-Git-Tag: v12.0.0~253^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a49726e10ef23be124d92872470fd258a1938d9e;p=ceph.git

mds: fix sessionmap version increasement when replaying ESessions

SessionMap::open_sessions() is used by ESessions::replay() to open
sessions that were opened by Server::prepare_force_open_sessions().

Server::prepare_force_open_sessions() increases session map's version
for each opened sessions. But SessionMap::open_sessions() only increases
session map's version by one.

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

diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
index fbd488ea83c..f5f049e88b3 100644
--- a/src/mds/SessionMap.h
+++ b/src/mds/SessionMap.h
@@ -563,8 +563,8 @@ public:
 	 ++p) {
       Session *s = get_or_add_session(p->second);
       set_state(s, Session::STATE_OPEN);
+      version++;
     }
-    version++;
   }
 
   // helpers