From 138be4fc53aa5466bc6dd0ad76dfd6d028206192 Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 14 Sep 2018 14:43:21 -0400
Subject: [PATCH] crimson/net: messenger uses dispatch gate for authorizer
 callbacks

this also removes the checks for null dispatcher - start() must be
called with a valid dispatcher before getting here

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---
 src/crimson/net/SocketMessenger.cc | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/crimson/net/SocketMessenger.cc b/src/crimson/net/SocketMessenger.cc
index 35db46a1994b8..f86a52fb752ba 100644
--- a/src/crimson/net/SocketMessenger.cc
+++ b/src/crimson/net/SocketMessenger.cc
@@ -215,21 +215,15 @@ SocketMessenger::verify_authorizer(peer_type_t peer_type,
 				   auth_proto_t protocol,
 				   bufferlist& auth)
 {
-  if (dispatcher) {
-    return dispatcher->ms_verify_authorizer(peer_type, protocol, auth);
-  } else {
-    return seastar::make_ready_future<msgr_tag_t, bufferlist>(
-        CEPH_MSGR_TAG_BADAUTHORIZER,
-        bufferlist{});
-  }
+  return seastar::with_gate(pending_dispatch, [=, &auth] {
+      return dispatcher->ms_verify_authorizer(peer_type, protocol, auth);
+    });
 }
 
 seastar::future<std::unique_ptr<AuthAuthorizer>>
 SocketMessenger::get_authorizer(peer_type_t peer_type, bool force_new)
 {
-  if (dispatcher) {
-    return dispatcher->ms_get_authorizer(peer_type, force_new);
-  } else {
-    return seastar::make_ready_future<std::unique_ptr<AuthAuthorizer>>(nullptr);
-  }
+  return seastar::with_gate(pending_dispatch, [=] {
+      return dispatcher->ms_get_authorizer(peer_type, force_new);
+    });
 }
-- 
2.39.5