]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::on_change: clear cache at the end 3540/head
authorSamuel Just <sjust@redhat.com>
Tue, 20 Jan 2015 19:58:51 +0000 (11:58 -0800)
committerSamuel Just <sjust@redhat.com>
Tue, 20 Jan 2015 19:58:51 +0000 (11:58 -0800)
Signed-off-by: Samuel Just <sjust@redhat.com>
src/osd/ReplicatedPG.cc

index 719258008ae8cbcb45478945749959103a9ba23d..87ee05cdcc197449f505945b65265b1f2aa31bfd 100644 (file)
@@ -9865,11 +9865,6 @@ void ReplicatedPG::on_change(ObjectStore::Transaction *t)
     hit_set_clear();
   }
 
-  // we don't want to cache object_contexts through the interval change
-  // NOTE: we actually assert that all currently live references are dead
-  // by the time the flush for the next interval completes.
-  object_contexts.clear();
-
   // requeue everything in the reverse order they should be
   // reexamined.
   clear_scrub_reserved();
@@ -9932,6 +9927,11 @@ void ReplicatedPG::on_change(ObjectStore::Transaction *t)
 
   debug_op_order.clear();
   unstable_stats.clear();
+
+  // we don't want to cache object_contexts through the interval change
+  // NOTE: we actually assert that all currently live references are dead
+  // by the time the flush for the next interval completes.
+  object_contexts.clear();
 }
 
 void ReplicatedPG::on_role_change()