]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: cleanup SessionMap init
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 18 Jan 2019 23:43:48 +0000 (15:43 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 4 Mar 2019 17:19:17 +0000 (09:19 -0800)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 69efdaf6465c368795c0e564898a39baf34d09c2)

src/mds/SessionMap.h

index a5067b58f9e796e2a5174680915867723923db5c..44b3d11a0a4e2f7767e7fd5ef5938787e49a32a9 100644 (file)
@@ -503,17 +503,18 @@ public:
   MDSRank *mds;
 
 protected:
-  version_t projected, committing, committed;
+  version_t projected = 0, committing = 0, committed = 0;
 public:
   map<int,xlist<Session*>* > by_state;
   uint64_t set_state(Session *session, int state);
   map<version_t, list<MDSInternalContextBase*> > commit_waiters;
   void update_average_session_age();
 
-  explicit SessionMap(MDSRank *m) : mds(m),
-                      projected(0), committing(0), committed(0),
-                       loaded_legacy(false)
-  { }
+  SessionMap() = delete;
+  explicit SessionMap(MDSRank *m)
+  :
+    mds(m)
+  {}
 
   ~SessionMap() override
   {
@@ -674,7 +675,7 @@ public:
 protected:
   std::set<entity_name_t> dirty_sessions;
   std::set<entity_name_t> null_sessions;
-  bool loaded_legacy;
+  bool loaded_legacy = false;
   void _mark_dirty(Session *session);
 public: