From: Samuel Just <sam.just@inktank.com>
Date: Fri, 19 Apr 2013 02:24:03 +0000 (-0700)
Subject: OpRequest: don't maintain history if the OSD is shutting down
X-Git-Tag: v0.61~136^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78c9db88cdf53788da7593962e193de8a8054f99;p=ceph.git

OpRequest: don't maintain history if the OSD is shutting down

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index d5ce8bbc7495..ea9beaacda3b 100644
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -29,7 +29,8 @@ void OpHistory::on_shutdown()
 
 void OpHistory::insert(utime_t now, OpRequestRef op)
 {
-  assert(!shutdown);
+  if (shutdown)
+    return;
   duration.insert(make_pair(op->get_duration(), op));
   arrived.insert(make_pair(op->get_arrived(), op));
   cleanup(now);