]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: there should be no object_contexts during on_activate
authorSamuel Just <samuel.just@dreamhost.com>
Fri, 16 Mar 2012 20:58:54 +0000 (13:58 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Sun, 18 Mar 2012 16:09:02 +0000 (09:09 -0700)
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
src/osd/ReplicatedPG.cc

index 5b5a3fdd0495c42b4799ada58368e3fcefcfff3f..04a705be1ab144e79ab87c2204e109cdb20b9661 100644 (file)
@@ -5547,11 +5547,7 @@ void ReplicatedPG::on_shutdown()
 
 void ReplicatedPG::on_activate()
 {
-  for (map<hobject_t, ObjectContext *>::iterator i = object_contexts.begin();
-       i != object_contexts.end();
-       ++i) {
-    populate_obc_watchers(i->second);
-  }
+  assert(object_contexts.empty());
 
   for (unsigned i = 1; i<acting.size(); i++) {
     if (peer_info[acting[i]].last_backfill != hobject_t::get_max()) {