From: Xuehan Xu <xxhdx1985126@gmail.com>
Date: Tue, 12 May 2020 08:36:48 +0000 (+0800)
Subject: crimson/mon: return -EBUSY, instead of asserting, when MonClient::active_con is absent
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1033^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6bc25e9db2f01b4b2d182b9f6f5bc8ddbec811e7;p=ceph-ci.git

crimson/mon: return -EBUSY, instead of asserting, when MonClient::active_con is absent

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
---

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index a6fc5cc0249..c8cfac8aa09 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -617,7 +617,10 @@ int Client::handle_auth_request(crimson::net::ConnectionRef con,
     return -EOPNOTSUPP;
   }
   auto authorizer_challenge = &auth_meta->authorizer_challenge;
-  ceph_assert(active_con);
+  if (!active_con) {
+    logger().error("connection to monitors is down, abort connection for now");
+    return -EBUSY;
+  }
   if (!HAVE_FEATURE(active_con->get_conn()->get_features(), CEPHX_V2)) {
     if (local_conf().get_val<uint64_t>("cephx_service_require_version") >= 2) {
       return -EACCES;