From: Sage Weil Date: Mon, 18 Oct 2021 19:10:15 +0000 (-0500) Subject: os/bluestore/ZonedFreelistManager: remove sanity checks X-Git-Tag: v17.1.0~535^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9fe9213c7159a1ffc4989d64e2aa242fe6af3ec0;p=ceph.git os/bluestore/ZonedFreelistManager: remove sanity checks These were there when I was using the merge operator; not really needed since it's just setting zeroed values now. Signed-off-by: Sage Weil --- diff --git a/src/os/bluestore/ZonedFreelistManager.cc b/src/os/bluestore/ZonedFreelistManager.cc index a940005e7a990..3a5bce66fe5d1 100644 --- a/src/os/bluestore/ZonedFreelistManager.cc +++ b/src/os/bluestore/ZonedFreelistManager.cc @@ -361,15 +361,6 @@ void ZonedFreelistManager::mark_zone_to_clean_free( { dout(10) << __func__ << " zone 0x" << std::hex << zone << std::dec << dendl; - if (true) { - string key; - _key_encode_u64(zone, &key); - KeyValueDB::Iterator it = kvdb->get_iterator(info_prefix); - it->lower_bound(key); - zone_state_t zs; - load_zone_state_from_db(zone, zs, it); - dout(20) << __func__ << " before " << zs << dendl; - } KeyValueDB::Transaction txn = kvdb->get_transaction(); zone_state_t empty_zone_state; @@ -378,17 +369,4 @@ void ZonedFreelistManager::mark_zone_to_clean_free( // block here until this commits so that we don't end up starting to allocate and // write to the new zone before this fully commits. kvdb->submit_transaction_sync(txn); - - if (true) { - // read it back to verify it is really zero! - string key; - _key_encode_u64(zone, &key); - KeyValueDB::Iterator it = kvdb->get_iterator(info_prefix); - it->lower_bound(key); - zone_state_t zs; - load_zone_state_from_db(zone, zs, it); - dout(20) << __func__ << " read back " << zs << dendl; - ceph_assert(zs.num_dead_bytes == 0); - ceph_assert(zs.write_pointer == 0); - } }