]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
common/TrackedOp: Should lock ops_history_lock when access shutdown.
authorJianpeng Ma <jianpeng.ma@intel.com>
Wed, 8 Jul 2015 05:12:49 +0000 (13:12 +0800)
committerDavid Zafman <dzafman@redhat.com>
Wed, 23 Nov 2016 22:12:51 +0000 (14:12 -0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 7fe72a2e7d116093ccff6683666e6289f5f12421)

src/common/TrackedOp.cc

index 056297541c5ac203b24bbe7f1fb90b00650bb944..a11c0652104488fcfa7ed53f51d980c4dd7c6340 100644 (file)
@@ -38,10 +38,9 @@ void OpHistory::on_shutdown()
 
 void OpHistory::insert(utime_t now, TrackedOpRef op)
 {
+  Mutex::Locker history_lock(ops_history_lock);
   if (shutdown)
     return;
-
-  Mutex::Locker history_lock(ops_history_lock);
   duration.insert(make_pair(op->get_duration(), op));
   arrived.insert(make_pair(op->get_initiated(), op));
   cleanup(now);