From bb42dada614abb9979d591501c6f8e011ee04954 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Wed, 6 Mar 2019 17:29:04 +0800 Subject: [PATCH] test/crimson: add dummy_auth to test_async_echo fix echo between async-msgrs Signed-off-by: Yingxin Cheng --- src/test/crimson/test_async_echo.cc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/test/crimson/test_async_echo.cc b/src/test/crimson/test_async_echo.cc index 98ea0e9d965..7a7323f1f73 100644 --- a/src/test/crimson/test_async_echo.cc +++ b/src/test/crimson/test_async_echo.cc @@ -9,6 +9,8 @@ #include "msg/Dispatcher.h" #include "msg/Messenger.h" +#include "auth/DummyAuth.h" + enum class echo_role { as_server, as_client, @@ -20,14 +22,18 @@ constexpr int CEPH_OSD_PROTOCOL = 10; struct Server { Server(CephContext* cct, const entity_inst_t& entity) - : dispatcher(cct) + : dummy_auth(cct), dispatcher(cct) { msgr.reset(Messenger::create(cct, "async", entity.name, "pong", entity.addr.get_nonce(), 0)); + dummy_auth.auth_registry.refresh_config(); msgr->set_cluster_protocol(CEPH_OSD_PROTOCOL); msgr->set_default_policy(Messenger::Policy::stateless_server(0)); + msgr->set_auth_client(&dummy_auth); + msgr->set_auth_server(&dummy_auth); dispatcher.ms_set_require_authorizer(false); } + DummyAuthClientServer dummy_auth; unique_ptr msgr; struct ServerDispatcher : Dispatcher { std::mutex mutex; @@ -76,15 +82,19 @@ struct Server { struct Client { unique_ptr msgr; Client(CephContext *cct) - : dispatcher(cct) + : dummy_auth(cct), dispatcher(cct) { msgr.reset(Messenger::create(cct, "async", entity_name_t::CLIENT(-1), "ping", getpid(), 0)); + dummy_auth.auth_registry.refresh_config(); msgr->set_cluster_protocol(CEPH_OSD_PROTOCOL); msgr->set_default_policy(Messenger::Policy::lossy_client(0)); + msgr->set_auth_client(&dummy_auth); + msgr->set_auth_server(&dummy_auth); dispatcher.ms_set_require_authorizer(false); } + DummyAuthClientServer dummy_auth; struct ClientDispatcher : Dispatcher { std::mutex mutex; std::condition_variable on_reply; -- 2.39.5