From: Xuehan Xu Date: Thu, 29 Feb 2024 12:17:33 +0000 (+0800) Subject: crimson/os/seastore/cached_extent: rename get_crc32c to calc_crc32c X-Git-Tag: testing/wip-pdonnell-testing-20240429.210911-debug~10^2~7 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=01776a081c041ee5b949de0f1a5841ca31baa8b2;p=ceph-ci.git crimson/os/seastore/cached_extent: rename get_crc32c to calc_crc32c Signed-off-by: Xuehan Xu --- diff --git a/src/crimson/os/seastore/btree/fixed_kv_node.h b/src/crimson/os/seastore/btree/fixed_kv_node.h index 6d7db2c4102..f4e7f6239a2 100644 --- a/src/crimson/os/seastore/btree/fixed_kv_node.h +++ b/src/crimson/os/seastore/btree/fixed_kv_node.h @@ -662,7 +662,7 @@ struct FixedKVInternalNode return this->get_size(); } - uint32_t get_crc32c() const final { + uint32_t calc_crc32c() const final { return this->calc_phy_checksum(); } @@ -1100,7 +1100,7 @@ struct FixedKVLeafNode return this->get_size(); } - uint32_t get_crc32c() const final { + uint32_t calc_crc32c() const final { return this->calc_phy_checksum(); } diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc index 537f7bea52f..c08576bf45a 100644 --- a/src/crimson/os/seastore/cache.cc +++ b/src/crimson/os/seastore/cache.cc @@ -1043,7 +1043,7 @@ CachedExtentRef Cache::duplicate_for_write( if (i->is_exist_clean()) { i->version++; i->state = CachedExtent::extent_state_t::EXIST_MUTATION_PENDING; - i->last_committed_crc = i->get_crc32c(); + i->last_committed_crc = i->calc_crc32c(); // deepcopy the buffer of exist clean extent beacuse it shares // buffer with original clean extent. auto bp = i->get_bptr(); @@ -1155,7 +1155,7 @@ record_t Cache::prepare_record( i->prepare_commit(); assert(i->get_version() > 0); - auto final_crc = i->get_crc32c(); + auto final_crc = i->calc_crc32c(); if (i->get_type() == extent_types_t::ROOT) { SUBTRACET(seastore_t, "writing out root delta {}B -- {}", t, delta_length, *i); @@ -1530,7 +1530,7 @@ void Cache::complete_commit( is_inline = true; i->set_paddr(final_block_start.add_relative(i->get_paddr())); } - assert(i->get_last_committed_crc() == i->get_crc32c()); + assert(i->get_last_committed_crc() == i->calc_crc32c()); i->pending_for_transaction = TRANS_ID_NULL; i->on_initial_write(); diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h index b6a8cddde51..86f27ee7d12 100644 --- a/src/crimson/os/seastore/cache.h +++ b/src/crimson/os/seastore/cache.h @@ -1659,7 +1659,7 @@ private: if (extent->is_valid()) { // crc will be checked against LBA leaf entry for logical extents, // or check against in-extent crc for physical extents. - extent->last_committed_crc = extent->get_crc32c(); + extent->last_committed_crc = extent->calc_crc32c(); extent->on_clean_read(); } extent->complete_io(); diff --git a/src/crimson/os/seastore/cached_extent.h b/src/crimson/os/seastore/cached_extent.h index a9b69e24846..f264b3a707c 100644 --- a/src/crimson/os/seastore/cached_extent.h +++ b/src/crimson/os/seastore/cached_extent.h @@ -542,7 +542,7 @@ public: } /// Returns crc32c of buffer - virtual uint32_t get_crc32c() const { + virtual uint32_t calc_crc32c() const { return ceph_crc32c( 1, reinterpret_cast(get_bptr().c_str()), @@ -1259,7 +1259,7 @@ public: void apply_delta_and_adjust_crc( paddr_t base, const ceph::bufferlist &bl) final { apply_delta(bl); - set_last_committed_crc(get_crc32c()); + set_last_committed_crc(calc_crc32c()); } bool is_logical() const final { diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc index 3b68e4069de..2efb402a9cc 100644 --- a/src/crimson/os/seastore/transaction_manager.cc +++ b/src/crimson/os/seastore/transaction_manager.cc @@ -335,7 +335,7 @@ TransactionManager::update_lba_mappings( if (!extent->get_last_committed_crc()) { extent->set_last_committed_crc(extent->calc_crc32c()); } - assert(extent->get_crc32c() == extent->get_last_committed_crc()); + assert(extent->calc_crc32c() == extent->get_last_committed_crc()); lextents.emplace_back(extent->template cast()); } else { pextents.emplace_back(extent); diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h index b74c02b8949..9e153be4275 100644 --- a/src/crimson/os/seastore/transaction_manager.h +++ b/src/crimson/os/seastore/transaction_manager.h @@ -882,7 +882,7 @@ private: } else { inconsistent = !(pin->get_checksum() == 0 || // TODO: remapped extents may // not have recorded chksums - pin->get_checksum() == ref->get_crc32c()); + pin->get_checksum() == ref->calc_crc32c()); } if (unlikely(inconsistent)) { SUBERRORT(seastore_tm, @@ -942,7 +942,7 @@ private: } else { inconsistent = !(pin->get_checksum() == 0 || // TODO: remapped extents may // not have recorded chksums - pin->get_checksum() == ref->get_crc32c()); + pin->get_checksum() == ref->calc_crc32c()); } if (unlikely(inconsistent)) { SUBERRORT(seastore_tm, @@ -1006,7 +1006,7 @@ private: fut = lba_manager->alloc_extent( t, remap_laddr, remap_length, remap_paddr, //TODO: oringal_bptr must be present if crc is enabled - (original_bptr.has_value() ? ext->get_crc32c() : 0), + (original_bptr.has_value() ? ext->calc_crc32c() : 0), *ext); } else { fut = lba_manager->clone_mapping( diff --git a/src/test/crimson/seastore/test_block.h b/src/test/crimson/seastore/test_block.h index d605497ae93..7073b8a1904 100644 --- a/src/test/crimson/seastore/test_block.h +++ b/src/test/crimson/seastore/test_block.h @@ -82,7 +82,7 @@ struct TestBlock : crimson::os::seastore::LogicalCachedExtent { } test_extent_desc_t get_desc() { - return { get_length(), get_crc32c() }; + return { get_length(), calc_crc32c() }; } void apply_delta(const ceph::bufferlist &bl) final; diff --git a/src/test/crimson/seastore/test_btree_lba_manager.cc b/src/test/crimson/seastore/test_btree_lba_manager.cc index 0be7bdd6049..3a5bde454d5 100644 --- a/src/test/crimson/seastore/test_btree_lba_manager.cc +++ b/src/test/crimson/seastore/test_btree_lba_manager.cc @@ -161,7 +161,7 @@ struct btree_test_base : extent->set_last_committed_crc(crc); extent->update_in_extent_chksum_field(crc); } - assert(extent->get_crc32c() == extent->get_last_committed_crc()); + assert(extent->calc_crc32c() == extent->get_last_committed_crc()); }; t.for_each_finalized_fresh_block(chksum_func); t.for_each_existing_block(chksum_func); @@ -252,7 +252,7 @@ struct lba_btree_test : btree_test_base { extent->set_last_committed_crc(crc); extent->update_in_extent_chksum_field(crc); } - assert(extent->get_crc32c() == extent->get_last_committed_crc()); + assert(extent->calc_crc32c() == extent->get_last_committed_crc()); }; t->for_each_finalized_fresh_block(chksum_func); @@ -453,7 +453,7 @@ struct btree_lba_manager_test : btree_test_base { extent->set_last_committed_crc(crc); extent->update_in_extent_chksum_field(crc); } - assert(extent->get_crc32c() == extent->get_last_committed_crc()); + assert(extent->calc_crc32c() == extent->get_last_committed_crc()); lextents.emplace_back(extent->template cast()); } else { pextents.push_back(extent); diff --git a/src/test/crimson/seastore/test_seastore_cache.cc b/src/test/crimson/seastore/test_seastore_cache.cc index 03f4af17c7b..518e6428b2a 100644 --- a/src/test/crimson/seastore/test_seastore_cache.cc +++ b/src/test/crimson/seastore/test_seastore_cache.cc @@ -40,7 +40,7 @@ struct cache_test_t : public seastar_test_suite_t { extent->set_last_committed_crc(crc); extent->update_in_extent_chksum_field(crc); } - assert(extent->get_crc32c() == extent->get_last_committed_crc()); + assert(extent->calc_crc32c() == extent->get_last_committed_crc()); }; t->for_each_finalized_fresh_block(chksum_func); @@ -156,7 +156,7 @@ TEST_F(cache_test_t, test_addr_fixup) placement_hint_t::HOT, 0); extent->set_contents('c'); - csum = extent->get_crc32c(); + csum = extent->calc_crc32c(); submit_transaction(std::move(t)).get0(); addr = extent->get_paddr(); } @@ -167,7 +167,7 @@ TEST_F(cache_test_t, test_addr_fixup) addr, TestBlockPhysical::SIZE).unsafe_get0(); ASSERT_EQ(extent->get_paddr(), addr); - ASSERT_EQ(extent->get_crc32c(), csum); + ASSERT_EQ(extent->calc_crc32c(), csum); } }); } @@ -187,7 +187,7 @@ TEST_F(cache_test_t, test_dirty_extent) placement_hint_t::HOT, 0); extent->set_contents('c'); - csum = extent->get_crc32c(); + csum = extent->calc_crc32c(); auto reladdr = extent->get_paddr(); ASSERT_TRUE(reladdr.is_relative()); { @@ -201,7 +201,7 @@ TEST_F(cache_test_t, test_dirty_extent) ASSERT_TRUE(extent->is_pending()); ASSERT_TRUE(extent->get_paddr().is_relative()); ASSERT_EQ(extent->get_version(), 0); - ASSERT_EQ(csum, extent->get_crc32c()); + ASSERT_EQ(csum, extent->calc_crc32c()); } submit_transaction(std::move(t)).get0(); addr = extent->get_paddr(); @@ -230,7 +230,7 @@ TEST_F(cache_test_t, test_dirty_extent) // duplicate and reset contents extent = cache->duplicate_for_write(*t, extent)->cast(); extent->set_contents('c'); - csum2 = extent->get_crc32c(); + csum2 = extent->calc_crc32c(); ASSERT_EQ(extent->get_paddr(), addr); { // test that concurrent read with fresh transaction sees old @@ -244,7 +244,7 @@ TEST_F(cache_test_t, test_dirty_extent) ASSERT_FALSE(extent->is_pending()); ASSERT_EQ(addr, extent->get_paddr()); ASSERT_EQ(extent->get_version(), 0); - ASSERT_EQ(csum, extent->get_crc32c()); + ASSERT_EQ(csum, extent->calc_crc32c()); } { // test that read with same transaction sees new block @@ -256,14 +256,14 @@ TEST_F(cache_test_t, test_dirty_extent) ASSERT_TRUE(extent->is_pending()); ASSERT_EQ(addr, extent->get_paddr()); ASSERT_EQ(extent->get_version(), 1); - ASSERT_EQ(csum2, extent->get_crc32c()); + ASSERT_EQ(csum2, extent->calc_crc32c()); } // submit transaction submit_transaction(std::move(t)).get0(); ASSERT_TRUE(extent->is_dirty()); ASSERT_EQ(addr, extent->get_paddr()); ASSERT_EQ(extent->get_version(), 1); - ASSERT_EQ(extent->get_crc32c(), csum2); + ASSERT_EQ(extent->calc_crc32c(), csum2); } { // test that fresh transaction now sees newly dirty block @@ -275,7 +275,7 @@ TEST_F(cache_test_t, test_dirty_extent) ASSERT_TRUE(extent->is_dirty()); ASSERT_EQ(addr, extent->get_paddr()); ASSERT_EQ(extent->get_version(), 1); - ASSERT_EQ(csum2, extent->get_crc32c()); + ASSERT_EQ(csum2, extent->calc_crc32c()); } }); }