From e304deac65c468d3b2b30c3086a1cd237833a56f Mon Sep 17 00:00:00 2001 From: Yingxin Date: Wed, 17 Oct 2018 23:12:45 +0800 Subject: [PATCH] crimson/net: fix compile errors test_alien_echo.cc is using common_init_finish, but it is not available if defined WITH_SEASTAR. Dispatcher::ms_verify_authorizer() is removed by PR#24095. Signed-off-by: Yingxin --- src/common/common_init.h | 2 -- src/test/crimson/test_alien_echo.cc | 16 ---------------- 2 files changed, 18 deletions(-) diff --git a/src/common/common_init.h b/src/common/common_init.h index 5a19d44ca92..a2c3dd84fd6 100644 --- a/src/common/common_init.h +++ b/src/common/common_init.h @@ -69,7 +69,6 @@ CephContext *common_preinit(const CephInitParameters &iparams, void complain_about_parse_errors(CephContext *cct, std::deque *parse_errors); -#ifndef WITH_SEASTAR /* This function is called after you have done your last * fork. When you make this call, the system will initialize everything that * cannot be initialized before a fork. @@ -83,6 +82,5 @@ void complain_about_parse_errors(CephContext *cct, * the Ceph libraries would be destroyed by a fork(). */ void common_init_finish(CephContext *cct); -#endif // #ifndef WITH_SEASTAR #endif diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc index 50a4d52e9dc..51e009145c7 100644 --- a/src/test/crimson/test_alien_echo.cc +++ b/src/test/crimson/test_alien_echo.cc @@ -133,14 +133,6 @@ struct Server { } on_reply.notify_one(); } - bool ms_verify_authorizer(Connection *con, int peer_type, int protocol, - bufferlist& authorizer, - bufferlist& authorizer_reply, - bool& isvalid, CryptoKey& session_key, - std::unique_ptr*) override { - isvalid = true; - return true; - } bool ms_dispatch(Message*) override { ceph_abort(); } @@ -196,14 +188,6 @@ struct Client { } on_reply.notify_one(); } - bool ms_verify_authorizer(Connection *con, int peer_type, int protocol, - bufferlist& authorizer, - bufferlist& authorizer_reply, - bool& isvalid, CryptoKey& session_key, - std::unique_ptr*) override { - isvalid = true; - return true; - } bool ms_dispatch(Message*) override { ceph_abort(); } -- 2.39.5