summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-04-18 19:24:03 -0700
committerSamuel Just <sam.just@inktank.com>2013-04-19 11:06:04 -0700
commit78c9db88cdf53788da7593962e193de8a8054f99 (patch)
treed70e17268a02d3b6df5058e5cde94b6d627e060f
parent1493e7dbfb4accd931e27c563526510492a11a8b (diff)
downloadceph-78c9db88cdf53788da7593962e193de8a8054f99.tar.gz
OpRequest: don't maintain history if the OSD is shutting down
Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/OpRequest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index d5ce8bbc749..ea9beaacda3 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);