From: Adam Kupczyk Date: Sat, 13 Nov 2021 10:28:18 +0000 (+0100) Subject: os/bluestore: Fix omap upgrade to per-pg scheme X-Git-Tag: v16.2.7~20^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e293295b5ecbbc6d4a7a4af2e07fcf99e1dc894a;p=ceph.git os/bluestore: Fix omap upgrade to per-pg scheme This is fix to regression introduced by fix to omap upgrade: https://github.com/ceph/ceph/pull/43687 The problem was that we always skipped first omap entry. This worked fine with objects having omap header key. For objects without header key we skipped first actual omap key. Fixes: https://tracker.ceph.com/issues/53307 Signed-off-by: Adam Kupczyk (cherry picked from commit 65a3f374aa1c57c5bb9401e57dab98a643b4360a) --- diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 77a12bd510091..8b893be79d18f 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -7863,6 +7863,7 @@ void BlueStore::_fsck_check_object_omap(FSCKDepth depth, txn->set(new_omap_prefix, new_head, header); txn_cost += new_head.length() + header.length(); } + it->next(); } // tail { @@ -7876,7 +7877,6 @@ void BlueStore::_fsck_check_object_omap(FSCKDepth depth, string final_key; Onode::calc_omap_key(new_flags, o.get(), string(), &final_key); size_t base_key_len = final_key.size(); - it->next(); while (it->valid() && it->key() < tail) { string user_key; o->decode_omap_key(it->key(), &user_key); diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 970c0cf2ae474..643cfc1fce7e2 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -6823,8 +6823,7 @@ INSTANTIATE_TEST_SUITE_P( #endif "kstore")); -//void doMany4KWritesTest(boost::scoped_ptr& store, -void doMany4KWritesTest(ObjectStore* store, +void doMany4KWritesTest(boost::scoped_ptr& store, unsigned max_objects, unsigned max_ops, unsigned max_object_size,