From 1a01cf4872601d8339b102d25cf4002544e7a8f7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 22 Oct 2018 10:00:28 -0500 Subject: [PATCH] ceph_test_msgr: fix authorizer behavior Fixes breakage from this PR 2152d8ffb73a507a3d08d48b38c5a8e73f887138. Fixes: http://tracker.ceph.com/issues/36495 Signed-off-by: Sage Weil --- src/test/msgr/test_msgr.cc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc index 38d91e33dff..6977269cde3 100644 --- a/src/test/msgr/test_msgr.cc +++ b/src/test/msgr/test_msgr.cc @@ -101,7 +101,10 @@ class FakeDispatcher : public Dispatcher { explicit FakeDispatcher(bool s): Dispatcher(g_ceph_context), lock("FakeDispatcher::lock"), is_server(s), got_new(false), got_remote_reset(false), - got_connect(false), loopback(false) {} + got_connect(false), loopback(false) { + // don't need authorizers + ms_set_require_authorizer(false); + } bool ms_can_fast_dispatch_any() const override { return true; } bool ms_can_fast_dispatch(const Message *m) const override { switch (m->get_type()) { @@ -834,7 +837,10 @@ class SyntheticDispatcher : public Dispatcher { SyntheticDispatcher(bool s, SyntheticWorkload *wl): Dispatcher(g_ceph_context), lock("SyntheticDispatcher::lock"), is_server(s), got_new(false), - got_remote_reset(false), got_connect(false), index(0), workload(wl) {} + got_remote_reset(false), got_connect(false), index(0), workload(wl) { + // don't need authorizers + ms_set_require_authorizer(false); + } bool ms_can_fast_dispatch_any() const override { return true; } bool ms_can_fast_dispatch(const Message *m) const override { switch (m->get_type()) { @@ -1394,7 +1400,10 @@ class MarkdownDispatcher : public Dispatcher { public: std::atomic count = { 0 }; explicit MarkdownDispatcher(bool s): Dispatcher(g_ceph_context), lock("MarkdownDispatcher::lock"), - last_mark(false) {} + last_mark(false) { + // don't need authorizers + ms_set_require_authorizer(false); + } bool ms_can_fast_dispatch_any() const override { return false; } bool ms_can_fast_dispatch(const Message *m) const override { switch (m->get_type()) { -- 2.39.5