From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Wed, 8 Jul 2015 05:12:49 +0000 (+0800)
Subject: common/TrackedOp: Should lock ops_history_lock when access shutdown.
X-Git-Tag: v0.94.10~11^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=656d0c9f307c1b3db072282be46decd72bc88810;p=ceph.git

common/TrackedOp: Should lock ops_history_lock when access shutdown.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 7fe72a2e7d116093ccff6683666e6289f5f12421)
---

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index 056297541c5..a11c0652104 100644
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -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);