]> git.apps.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)
committerNathan Cutler <ncutler@suse.com>
Thu, 24 Oct 2019 15:51:11 +0000 (17:51 +0200)
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 69efdaf)

Conflicts:
    src/mds/SessionMap.h

src/mds/SessionMap.h

index d528205c5b2c7b6ebb43d79196ad2c46cc1e67fc..289023a4ec1e8f83bb5c587d45dc9ef6bfcfca2d 100644 (file)
@@ -508,17 +508,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
   {
@@ -669,7 +670,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, bool may_save);
 public: