From 65a3f374aa1c57c5bb9401e57dab98a643b4360a Mon Sep 17 00:00:00 2001 From: Adam Kupczyk Date: Sat, 13 Nov 2021 11:28:18 +0100 Subject: [PATCH] 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/53260 Signed-off-by: Adam Kupczyk --- src/os/bluestore/BlueStore.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index a0dcfa80b7f..034b379c0a7 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -8324,6 +8324,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 { @@ -8337,7 +8338,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); -- 2.39.5