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 <shraddha.agrawal000@gmail.com>

diff --git a/src/crimson/os/alienstore/alien_store.cc b/src/crimson/os/alienstore/alien_store.cc
index 59f20964dfbb16b80085e8c57e3b9a8c0543e8ee..e28dd090d203244b6c838d84c4e600eca8ec1b2b 100644 (file)
--- 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 6dae3ec9d954a4bcd03f3f906124761290ef694b..7f9c63a0929aa7a88915f87801d459e5ad1845b9 100644 (file)
--- 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()