]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OpRequest: don't maintain history if the OSD is shutting down
authorSamuel Just <sam.just@inktank.com>
Fri, 19 Apr 2013 02:24:03 +0000 (19:24 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 19 Apr 2013 18:06:04 +0000 (11:06 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/OpRequest.cc

index d5ce8bbc74953cf2684c0249832d2d9c51ff0e67..ea9beaacda3b0abcdae35a5dbe97f1c35171990a 100644 (file)
@@ -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);