From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 18 Feb 2021 21:38:06 +0000 (+0000)
Subject: crimson/monc: don't assume reopen_session() shall establish active_con.
X-Git-Tag: v17.1.0~2891^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc2d4f1c396462210b1b87f44c55c70d9aa4ab25;p=ceph-ci.git

crimson/monc: don't assume reopen_session() shall establish active_con.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index 410285fccbf..b2e954a4579 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -513,7 +513,9 @@ void Client::tick()
                                        active_con->renew_tickets(),
                                        active_con->renew_rotating_keyring()).then_unpack([] {});
     } else {
-      return seastar::now();
+      assert(is_hunting());
+      logger().info("{} continuing the hunt", __func__);
+      return authenticate();
     }
   });
 }
@@ -1032,8 +1034,8 @@ seastar::future<> Client::reopen_session(int rank)
     });
   }).then([this] {
     if (!active_con) {
-      return seastar::make_exception_future(
-	  crimson::common::system_shutdown_exception());
+      logger().warn("cannot establish the active_con with any mon");
+      return seastar::now();
     }
     return active_con->renew_rotating_keyring();
   });