]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD: add a Session::sent_epoch_lock
authorGreg Farnum <greg@inktank.com>
Thu, 20 Mar 2014 22:44:15 +0000 (15:44 -0700)
committerGreg Farnum <greg@inktank.com>
Mon, 5 May 2014 22:29:18 +0000 (15:29 -0700)
Signed-off-by: Greg Farnum <greg@inktank.com>
src/osd/OSD.h

index ffd9024c9b9e84f3a4fb4c713df4e278fe47d70b..7fec20d662271e23017479711b55116d29edc614 100644 (file)
@@ -1007,16 +1007,20 @@ public:
     EntityName entity_name;
     OSDCap caps;
     int64_t auid;
-    epoch_t last_sent_epoch;
     ConnectionRef con;
     WatchConState wstate;
 
     Mutex session_dispatch_lock;
     list<OpRequestRef> waiting_on_map;
 
+    Mutex sent_epoch_lock;
+    epoch_t last_sent_epoch;
+
     Session() :
-      auid(-1), last_sent_epoch(0), con(0),
-      session_dispatch_lock("Session::session_dispatch_lock")
+      auid(-1), con(0),
+      session_dispatch_lock("Session::session_dispatch_lock"),
+      sent_epoch_lock("Session::sent_epoch_lock"),
+      last_sent_epoch(0)
     {}
   };
   Mutex session_waiting_for_map_lock;