--- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3797,22 +3797,21 @@ int OSD::init() set_osdmap(osdmap); // make sure we don't have legacy pgs deleting - { + if (false) { vector ls; int r = store->list_collections(ls); ceph_assert(r >= 0); for (auto c : ls) { spg_t pgid; - if (c.is_pg(&pgid) && - !osdmap->have_pg_pool(pgid.pool())) { - ghobject_t oid = make_final_pool_info_oid(pgid.pool()); - if (!store->exists(service.meta_ch, oid)) { - derr << __func__ << " missing pg_pool_t for deleted pool " - << pgid.pool() << " for pg " << pgid - << "; please downgrade to luminous and allow " - << "pg deletion to complete before upgrading" << dendl; - ceph_abort(); - } + if (c.is_pg(&pgid) && !osdmap->have_pg_pool(pgid.pool())) { + ghobject_t oid = make_final_pool_info_oid(pgid.pool()); + if (!store->exists(service.meta_ch, oid)) { + derr << __func__ << " missing pg_pool_t for deleted pool " + << pgid.pool() << " for pg " << pgid + << "; please downgrade to luminous and allow " + << "pg deletion to complete before upgrading" << dendl; + ceph_abort(); + } } } }