From 30b9ddb4f71657fc2e4deb8b4a0f3b657da45ce9 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Wed, 10 May 2023 13:54:17 +0000 Subject: [PATCH] crimson/osd/shard_services: Refactor OSDSingletonState::load_map Added logs If case reconstructed - epoch is unsigned. Signed-off-by: Matan Breizman (cherry picked from commit ecac14a70031299d744fecb7b6c3fb464a346a80) --- src/crimson/osd/shard_services.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc index 6ec6b5cbcbeff..2d410937b7d3d 100644 --- a/src/crimson/osd/shard_services.cc +++ b/src/crimson/osd/shard_services.cc @@ -405,14 +405,14 @@ seastar::future> OSDSingletonState::load_map_bls( seastar::future> OSDSingletonState::load_map(epoch_t e) { auto o = std::make_unique(); - if (e > 0) { - return load_map_bl(e).then([o=std::move(o)](bufferlist bl) mutable { - o->decode(bl); - return seastar::make_ready_future>(std::move(o)); - }); - } else { + logger().info("{} osdmap.{}", __func__, e); + if (e == 0) { return seastar::make_ready_future>(std::move(o)); } + return load_map_bl(e).then([o=std::move(o)](bufferlist bl) mutable { + o->decode(bl); + return seastar::make_ready_future>(std::move(o)); + }); } seastar::future<> OSDSingletonState::store_maps(ceph::os::Transaction& t, -- 2.39.5