From: Igor Fedotov Date: Wed, 10 Jan 2024 16:28:13 +0000 (+0300) Subject: test/store_test: get rid off explicit offset specifications in shared X-Git-Tag: testing/wip-mchangir-testing-20250210.054048-squid-debug~62^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ee8053998f2f66415999318079af895e4a3141a;p=ceph-ci.git test/store_test: get rid off explicit offset specifications in shared blob repair test case. Signed-off-by: Igor Fedotov (cherry picked from commit 482e5b85f08a07200c1f18db509b6b0f2ebcf3e6) --- diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index f7b2ffaaf0f..f26c63ca5ff 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -11254,6 +11254,12 @@ out_scan: return repair ? errors + warnings - (int)repaired : errors; } +int BlueStore::get_shared_blob(const string& key, + bufferlist& bl) +{ + return db->get(PREFIX_SHARED_BLOB, key, &bl); +}; + /// methods to inject various errors fsck can repair void BlueStore::inject_broken_shared_blob_key(const string& key, const bufferlist& bl) diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 07690d54b0f..d7086c6645c 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -3375,6 +3375,8 @@ public: } /// methods to inject various errors fsck can repair + int get_shared_blob(const std::string& key, + ceph::buffer::list& bl); void inject_broken_shared_blob_key(const std::string& key, const ceph::buffer::list& bl); void inject_no_shared_blob_key(); diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 486aa6be529..3ad072a5304 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -9751,13 +9751,26 @@ TEST_P(StoreTestSpecificAUSize, BluestoreRepairSharedBlobTest) { bstore->umount(); bstore->mount(); { + bufferlist bl; string key; _key_encode_u64(1, &key); bluestore_shared_blob_t sb(1); - sb.ref_map.get(0x822000, block_size); - sb.ref_map.get(0x824000, block_size); - sb.ref_map.get(0x824000, block_size); - bufferlist bl; + int r = bstore->get_shared_blob(key, bl); + ASSERT_EQ(r, 0); + decode(sb, bl); + cout << sb.ref_map << std::endl; + ASSERT_EQ(sb.ref_map.ref_map.size(), 2); + auto it = sb.ref_map.ref_map.begin(); + ASSERT_EQ(it->second.refs, 1); + ASSERT_EQ(it->second.length, block_size); + it++; + ASSERT_EQ(it->second.refs, 1); + ASSERT_EQ(it->second.length, block_size); + + sb.ref_map.get(it->first, block_size); + cout << sb.ref_map << std::endl; + + bl.clear(); encode(sb, bl); bstore->inject_broken_shared_blob_key(key, bl); }