From f745f80ca4de2cd3b4dfa17a7ad71679dc1bcf07 Mon Sep 17 00:00:00 2001 From: Shraddha Agrawal Date: Tue, 31 Mar 2026 19:30:58 +0530 Subject: [PATCH] src/crimson/osd/osd.cc: add osd_objectstore field to osd metadata This commit adds osd_objectstore metadata to the ceph osd metadata command. This is done by reading the value of type from the objectstore's metadata. Signed-off-by: Shraddha Agrawal --- src/crimson/os/alienstore/alien_store.cc | 6 +----- src/crimson/osd/osd.cc | 7 ++++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/crimson/os/alienstore/alien_store.cc b/src/crimson/os/alienstore/alien_store.cc index 59f20964dfbb..e28dd090d203 100644 --- a/src/crimson/os/alienstore/alien_store.cc +++ b/src/crimson/os/alienstore/alien_store.cc @@ -529,11 +529,7 @@ AlienStore::read_meta(const std::string& key) return tp->submit([key, this] { std::string value; int r = store->read_meta(key, &value); - if (r > 0) { - value.resize(r); - boost::algorithm::trim_right_if(value, - [] (unsigned char c) {return isspace(c);}); - } else { + if (r < 0) { value.clear(); } return std::make_pair(r, value); diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index 6dae3ec9d954..7f9c63a0929a 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -710,7 +710,12 @@ seastar::future<> OSD::_send_boot() // See OSDMonitor::preprocess_boot, prevents boot without allow_crimson // OSDMap flag m->metadata["osd_type"] = "crimson"; - return monc->send_message(std::move(m)); + + auto [ret, type] = co_await store.read_meta("type"); + if (ret == 0) { + m->metadata["osd_objectstore"] = type; + } + co_return co_await monc->send_message(std::move(m)); } seastar::future<> OSD::_add_device_class() -- 2.47.3