From 6e1c77d1ff725b06dcebea5e83bae8947a9dbbce Mon Sep 17 00:00:00 2001 From: Yang Honggang Date: Mon, 1 Jun 2020 13:43:21 +0800 Subject: [PATCH] msg/Message.cc: fix build error when WITH_BLKIN is on Signed-off-by: Yang Honggang --- src/msg/Message.cc | 8 ++++++-- src/test/rgw/CMakeLists.txt | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/msg/Message.cc b/src/msg/Message.cc index 27ef95d9db0..1d6cbeaa197 100644 --- a/src/msg/Message.cc +++ b/src/msg/Message.cc @@ -211,6 +211,10 @@ #include "messages/MOSDPGUpdateLogMissing.h" #include "messages/MOSDPGUpdateLogMissingReply.h" +#ifdef WITH_BLKIN +#include "Messenger.h" +#endif + #define DEBUGLVL 10 // debug level of output #define dout_subsys ceph_subsys_ms @@ -973,12 +977,12 @@ void Message::decode_trace(ceph::bufferlist::const_iterator &p, bool create) const auto msgr = connection->get_messenger(); const auto endpoint = msgr->get_trace_endpoint(); if (info.trace_id) { - trace.init(get_type_name(), endpoint, &info, true); + trace.init(get_type_name().data(), endpoint, &info, true); trace.event("decoded trace"); } else if (create || (msgr->get_myname().is_osd() && msgr->cct->_conf->osd_blkin_trace_all)) { // create a trace even if we didn't get one on the wire - trace.init(get_type_name(), endpoint); + trace.init(get_type_name().data(), endpoint); trace.event("created trace"); } trace.keyval("tid", get_tid()); diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt index b96b06f3a13..ab1e2f65a5b 100644 --- a/src/test/rgw/CMakeLists.txt +++ b/src/test/rgw/CMakeLists.txt @@ -86,6 +86,7 @@ target_link_libraries(ceph_test_rgw_obj cls_user_client librados global + ceph-common ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${CMAKE_DL_LIBS} -- 2.39.5