]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: drop legacy infos object cleanup
authorSage Weil <sage@redhat.com>
Fri, 15 Sep 2017 22:43:29 +0000 (18:43 -0400)
committerSage Weil <sage@redhat.com>
Fri, 6 Oct 2017 18:08:17 +0000 (13:08 -0500)
This won't be there post-luminous

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc

index f45bd6302936eaa3ff0d1d4476e1bb690f8803c1..d9e6c2d4949c5d0d33960e30e91f434c885d5ad4 100644 (file)
@@ -4006,19 +4006,6 @@ void OSD::load_pgs()
     dout(0) << "load_pgs opened " << pg_map.size() << " pgs" << dendl;
   }
 
-  // clean up old infos object?
-  if (has_upgraded && store->exists(coll_t::meta(), OSD::make_infos_oid())) {
-    dout(1) << __func__ << " removing legacy infos object" << dendl;
-    ObjectStore::Transaction t;
-    t.remove(coll_t::meta(), OSD::make_infos_oid());
-    int r = store->apply_transaction(service.meta_osr.get(), std::move(t));
-    if (r != 0) {
-      derr << __func__ << ": apply_transaction returned "
-          << cpp_strerror(r) << dendl;
-      ceph_abort();
-    }
-  }
-
   build_past_intervals_parallel();
 }