crimson: fix the problem that crimson-osd can't establish stable connection with mgr

Signed-off-by: Xuehan Xu <xxhdx1985126@163.com>

diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
index 510ef0fca6f8021895c0ebef7fbb111fe6eb06a6..224deb55de9aa46f8b90947e326a9745f0629520 100644 (file)
--- a/src/crimson/CMakeLists.txt
+++ b/src/crimson/CMakeLists.txt
@@ -80,6 +80,7 @@ add_library(crimson-common STATIC
   ${PROJECT_SOURCE_DIR}/src/common/Thread.cc
   ${PROJECT_SOURCE_DIR}/src/common/PluginRegistry.cc
   ${PROJECT_SOURCE_DIR}/src/common/RefCountedObj.cc
+  ${PROJECT_SOURCE_DIR}/src/common/util.cc
   ${PROJECT_SOURCE_DIR}/src/crush/builder.c
   ${PROJECT_SOURCE_DIR}/src/crush/mapper.c
   ${PROJECT_SOURCE_DIR}/src/crush/crush.c

diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc
index 843666ea8b2bdb95df0fc3ee1794b8a92d9f052a..a7ac211529e5c8e05c44a8c1fbfa7b11708e5715 100644 (file)
--- a/src/crimson/osd/osd.cc
+++ b/src/crimson/osd/osd.cc
@@ -8,6 +8,7 @@
 #include <boost/smart_ptr/make_local_shared.hpp>
 #include <fmt/format.h>
 #include <fmt/ostream.h>
+#include <sys/utsname.h>
 #include "common/pick_address.h"
 
 #include "messages/MOSDAlive.h"
@@ -40,6 +41,7 @@
 #include "crimson/osd/osd_operations/peering_event.h"
 #include "crimson/osd/osd_operations/pg_advance_map.h"
 #include "crimson/osd/osd_operations/replicated_request.h"
+#include "include/util.h"
 
 namespace {
   seastar::logger& logger() {
@@ -343,6 +345,7 @@ seastar::future<> OSD::_send_boot()
                                   heartbeat->get_front_addrs(),
                                   cluster_msgr->get_myaddrs(),
                                   CEPH_FEATURES_ALL);
+  collect_sys_info(&m->metadata, NULL);
   return monc->send_message(m);
 }